kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'dev/use-fphsa-in-find-opengl' 

937e369 Use FPHSA in FindOpenGL
This commit is contained in:
Brad King 2010-12-28 15:25:19 -05:00 committed by CMake Topic Stage
parent 75191fa312 937e3693d7
commit 8b73f54bc6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindOpenGL.cmake
View File

@ -123,7 +123,6 @@ ELSE (WIN32)
ENDIF(APPLE) ENDIF(APPLE)
ENDIF (WIN32) ENDIF (WIN32)
SET( OPENGL_FOUND "NO" )
IF(OPENGL_gl_LIBRARY) IF(OPENGL_gl_LIBRARY)
IF(OPENGL_xmesa_INCLUDE_DIR) IF(OPENGL_xmesa_INCLUDE_DIR)
@ -140,10 +139,7 @@ IF(OPENGL_gl_LIBRARY)
SET( OPENGL_GLU_FOUND "NO" ) SET( OPENGL_GLU_FOUND "NO" )
ENDIF(OPENGL_glu_LIBRARY) ENDIF(OPENGL_glu_LIBRARY)
SET( OPENGL_FOUND "YES" )
# This deprecated setting is for backward compatibility with CMake1.4 # This deprecated setting is for backward compatibility with CMake1.4
SET (OPENGL_LIBRARY ${OPENGL_LIBRARIES}) SET (OPENGL_LIBRARY ${OPENGL_LIBRARIES})
ENDIF(OPENGL_gl_LIBRARY) ENDIF(OPENGL_gl_LIBRARY)
@ -151,6 +147,11 @@ ENDIF(OPENGL_gl_LIBRARY)
# This deprecated setting is for backward compatibility with CMake1.4 # This deprecated setting is for backward compatibility with CMake1.4
SET(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR}) SET(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
# handle the QUIETLY and REQUIRED arguments and set OPENGL_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenGL DEFAULT_MSG OPENGL_gl_LIBRARY)
MARK_AS_ADVANCED( MARK_AS_ADVANCED(
OPENGL_INCLUDE_DIR OPENGL_INCLUDE_DIR
OPENGL_xmesa_INCLUDE_DIR OPENGL_xmesa_INCLUDE_DIR