FindGLUT: honor REQUIRED (#12466)
This commit is contained in:
parent
59ecc2c8ac
commit
14dadbde80
|
@ -64,25 +64,23 @@ ELSE (WIN32)
|
||||||
|
|
||||||
ENDIF (WIN32)
|
ENDIF (WIN32)
|
||||||
|
|
||||||
SET( GLUT_FOUND "NO" )
|
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
||||||
IF(GLUT_INCLUDE_DIR)
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLUT REQUIRED_VARS GLUT_glut_LIBRARY GLUT_INCLUDE_DIR)
|
||||||
IF(GLUT_glut_LIBRARY)
|
|
||||||
# Is -lXi and -lXmu required on all platforms that have it?
|
|
||||||
# If not, we need some way to figure out what platform we are on.
|
|
||||||
SET( GLUT_LIBRARIES
|
|
||||||
${GLUT_glut_LIBRARY}
|
|
||||||
${GLUT_Xmu_LIBRARY}
|
|
||||||
${GLUT_Xi_LIBRARY}
|
|
||||||
${GLUT_cocoa_LIBRARY}
|
|
||||||
)
|
|
||||||
SET( GLUT_FOUND "YES" )
|
|
||||||
|
|
||||||
#The following deprecated settings are for backwards compatibility with CMake1.4
|
IF (GLUT_FOUND)
|
||||||
SET (GLUT_LIBRARY ${GLUT_LIBRARIES})
|
# Is -lXi and -lXmu required on all platforms that have it?
|
||||||
SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
|
# If not, we need some way to figure out what platform we are on.
|
||||||
|
SET( GLUT_LIBRARIES
|
||||||
|
${GLUT_glut_LIBRARY}
|
||||||
|
${GLUT_Xmu_LIBRARY}
|
||||||
|
${GLUT_Xi_LIBRARY}
|
||||||
|
${GLUT_cocoa_LIBRARY}
|
||||||
|
)
|
||||||
|
|
||||||
ENDIF(GLUT_glut_LIBRARY)
|
#The following deprecated settings are for backwards compatibility with CMake1.4
|
||||||
ENDIF(GLUT_INCLUDE_DIR)
|
SET (GLUT_LIBRARY ${GLUT_LIBRARIES})
|
||||||
|
SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
|
||||||
|
ENDIF(GLUT_FOUND)
|
||||||
|
|
||||||
MARK_AS_ADVANCED(
|
MARK_AS_ADVANCED(
|
||||||
GLUT_INCLUDE_DIR
|
GLUT_INCLUDE_DIR
|
||||||
|
|
Loading…
Reference in New Issue