Revision: 55664
http://sourceforge.net/p/brlcad/code/55664
Author: starseeker
Date: 2013-06-04 20:05:46 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
Add NO_CMAKE_SYSTEM_PATH to OpenGL searches, to mirror FindX11 behavior.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/FindGL.cmake
Modified: brlcad/trunk/misc/CMake/FindGL.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindGL.cmake 2013-06-04 19:04:55 UTC (rev
55663)
+++ brlcad/trunk/misc/CMake/FindGL.cmake 2013-06-04 20:05:46 UTC (rev
55664)
@@ -191,17 +191,17 @@
endif(APPLE)
if(OPENGL_USE_AQUA)
- find_library(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL lib for OSX")
+ find_library(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL lib for OSX" )
find_library(OPENGL_glu_LIBRARY AGL DOC "AGL lib for OSX")
find_path(OPENGL_INCLUDE_DIR_GL OpenGL/gl.h DOC "Include for OpenGL on
OSX")
else(OPENGL_USE_AQUA)
# If we're on Apple and not using Aqua, we don't want frameworks
set(CMAKE_FIND_FRAMEWORK "NEVER")
- find_path(OPENGL_INCLUDE_DIR_GL GL/gl.h ${OPENGL_INC_SEARCH_PATH})
- find_path(OPENGL_INCLUDE_DIR_GLX GL/glx.h ${OPENGL_INC_SEARCH_PATH})
- find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h ${OPENGL_INC_SEARCH_PATH})
- find_library(OPENGL_gl_LIBRARY NAMES GL MesaGL PATHS
${OPENGL_LIB_SEARCH_PATH})
+ find_path(OPENGL_INCLUDE_DIR_GL GL/gl.h ${OPENGL_INC_SEARCH_PATH}
NO_CMAKE_SYSTEM_PATH)
+ find_path(OPENGL_INCLUDE_DIR_GLX GL/glx.h ${OPENGL_INC_SEARCH_PATH}
NO_CMAKE_SYSTEM_PATH)
+ find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h ${OPENGL_INC_SEARCH_PATH}
NO_CMAKE_SYSTEM_PATH)
+ find_library(OPENGL_gl_LIBRARY NAMES GL MesaGL PATHS
${OPENGL_LIB_SEARCH_PATH} NO_CMAKE_SYSTEM_PATH)
# On Unix OpenGL most certainly always requires X11.
# Feel free to tighten up these conditions if you don't
@@ -217,7 +217,7 @@
endif(X11_FOUND)
endif(OPENGL_gl_LIBRARY)
- find_library(OPENGL_glu_LIBRARY NAMES GLU MesaGLU PATHS
${OPENGL_LIB_SEARCH_PATH})
+ find_library(OPENGL_glu_LIBRARY NAMES GLU MesaGLU PATHS
${OPENGL_LIB_SEARCH_PATH} NO_CMAKE_SYSTEM_PATH)
endif(OPENGL_USE_AQUA)
endif(WIN32)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
