Do not use custom FindGLUT cmake script.
This commit is contained in:
castano
parent
f92a2191f2
commit
1c6b65ad52
@ -8,6 +8,8 @@ IF(WIN32)
|
|||||||
SET(GNUWIN32 "${NV_SOURCE_DIR}/extern/gnuwin32")
|
SET(GNUWIN32 "${NV_SOURCE_DIR}/extern/gnuwin32")
|
||||||
SET(CMAKE_INCLUDE_PATH "${GNUWIN32}/include")
|
SET(CMAKE_INCLUDE_PATH "${GNUWIN32}/include")
|
||||||
SET(CMAKE_LIBRARY_PATH "${GNUWIN32}/lib")
|
SET(CMAKE_LIBRARY_PATH "${GNUWIN32}/lib")
|
||||||
|
|
||||||
|
SET(GLUT_ROOT_PATH "${NV_SOURCE_DIR}/extern/glut")
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
|
INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
|
||||||
|
|||||||
@ -1,132 +0,0 @@
|
|||||||
# - try to find glut library and include files
|
|
||||||
# GLUT_INCLUDE_DIR, where to find GL/glut.h, etc.
|
|
||||||
# GLUT_LIBRARIES, the libraries to link against
|
|
||||||
# GLUT_DEFINITIONS - You should ADD_DEFINITIONS(${GLUT_DEFINITIONS}) before compiling code that includes png library files.
|
|
||||||
# GLUT_FOUND, If false, do not try to use GLUT.
|
|
||||||
# Also defined, but not for general use are:
|
|
||||||
# GLUT_glut_LIBRARY = the full path to the glut library.
|
|
||||||
# GLUT_Xmu_LIBRARY = the full path to the Xmu library.
|
|
||||||
# GLUT_Xi_LIBRARY = the full path to the Xi Library.
|
|
||||||
|
|
||||||
IF (WIN32)
|
|
||||||
|
|
||||||
# By default the GLUT include tries to autolink using #pragma directives, but those
|
|
||||||
# interfere with the other cmake definitions
|
|
||||||
SET (GLUT_DEFINITIONS -DGLUT_NO_LIB_PRAGMA)
|
|
||||||
|
|
||||||
IF(CYGWIN)
|
|
||||||
|
|
||||||
FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
|
|
||||||
/usr/include
|
|
||||||
)
|
|
||||||
|
|
||||||
FIND_LIBRARY( GLUT_glut_LIBRARY glut32
|
|
||||||
${OPENGL_LIBRARY_DIR}
|
|
||||||
/usr/lib
|
|
||||||
/usr/lib/w32api
|
|
||||||
/usr/local/lib
|
|
||||||
/usr/X11R6/lib
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
ELSE(CYGWIN)
|
|
||||||
|
|
||||||
# FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
|
|
||||||
# ${GLUT_ROOT_PATH}/include
|
|
||||||
# )
|
|
||||||
|
|
||||||
# FIND_LIBRARY( GLUT_glut_LIBRARY glut32
|
|
||||||
# ${GLUT_ROOT_PATH}/lib
|
|
||||||
# ${OPENGL_LIBRARY_DIR}
|
|
||||||
# )
|
|
||||||
|
|
||||||
FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
|
|
||||||
${GLUT_ROOT_PATH}/include
|
|
||||||
${PROJECT_SOURCE_DIR}/src/nvgl/glut/include
|
|
||||||
DOC "The directory where GL/glut.h resides")
|
|
||||||
FIND_LIBRARY( GLUT_glut_LIBRARY
|
|
||||||
NAMES glut GLUT glut32 glut32s
|
|
||||||
PATHS
|
|
||||||
${GLUT_ROOT_PATH}/lib
|
|
||||||
${PROJECT_SOURCE_DIR}/src/nvgl/glut/bin
|
|
||||||
${PROJECT_SOURCE_DIR}/src/nvgl/glut/lib
|
|
||||||
${OPENGL_LIBRARY_DIR}
|
|
||||||
DOC "The GLUT library")
|
|
||||||
|
|
||||||
ENDIF(CYGWIN)
|
|
||||||
|
|
||||||
ELSE (WIN32)
|
|
||||||
|
|
||||||
IF (APPLE)
|
|
||||||
# These values for Apple could probably do with improvement.
|
|
||||||
FIND_PATH( GLUT_INCLUDE_DIR glut.h
|
|
||||||
/System/Library/Frameworks/GLUT.framework/Versions/A/Headers
|
|
||||||
${OPENGL_LIBRARY_DIR}
|
|
||||||
)
|
|
||||||
SET(GLUT_glut_LIBRARY "-framework Glut" CACHE STRING "GLUT library for OSX")
|
|
||||||
SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
|
|
||||||
ELSE (APPLE)
|
|
||||||
|
|
||||||
FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
|
|
||||||
/usr/include
|
|
||||||
/usr/include/GL
|
|
||||||
/usr/local/include
|
|
||||||
/usr/openwin/share/include
|
|
||||||
/usr/openwin/include
|
|
||||||
/usr/X11R6/include
|
|
||||||
/usr/include/X11
|
|
||||||
/opt/graphics/OpenGL/include
|
|
||||||
/opt/graphics/OpenGL/contrib/libglut
|
|
||||||
)
|
|
||||||
|
|
||||||
FIND_LIBRARY( GLUT_glut_LIBRARY glut
|
|
||||||
/usr/lib
|
|
||||||
/usr/local/lib
|
|
||||||
/usr/openwin/lib
|
|
||||||
/usr/X11R6/lib
|
|
||||||
)
|
|
||||||
|
|
||||||
FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
|
|
||||||
/usr/lib
|
|
||||||
/usr/local/lib
|
|
||||||
/usr/openwin/lib
|
|
||||||
/usr/X11R6/lib
|
|
||||||
)
|
|
||||||
|
|
||||||
FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
|
|
||||||
/usr/lib
|
|
||||||
/usr/local/lib
|
|
||||||
/usr/openwin/lib
|
|
||||||
/usr/X11R6/lib
|
|
||||||
)
|
|
||||||
|
|
||||||
ENDIF (APPLE)
|
|
||||||
|
|
||||||
ENDIF (WIN32)
|
|
||||||
|
|
||||||
SET( GLUT_FOUND "NO" )
|
|
||||||
IF(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
|
|
||||||
SET (GLUT_LIBRARY ${GLUT_LIBRARIES})
|
|
||||||
SET (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR})
|
|
||||||
|
|
||||||
ENDIF(GLUT_glut_LIBRARY)
|
|
||||||
ENDIF(GLUT_INCLUDE_DIR)
|
|
||||||
|
|
||||||
MARK_AS_ADVANCED(
|
|
||||||
GLUT_INCLUDE_DIR
|
|
||||||
GLUT_glut_LIBRARY
|
|
||||||
GLUT_Xmu_LIBRARY
|
|
||||||
GLUT_Xi_LIBRARY
|
|
||||||
)
|
|
||||||
@ -15,8 +15,7 @@ ELSE(OPENGL_FOUND)
|
|||||||
ENDIF(OPENGL_FOUND)
|
ENDIF(OPENGL_FOUND)
|
||||||
|
|
||||||
# GLUT
|
# GLUT
|
||||||
INCLUDE(${NV_CMAKE_DIR}/FindGLUT.cmake)
|
INCLUDE(FindGLUT)
|
||||||
#INCLUDE(FindGLUT)
|
|
||||||
IF(GLUT_FOUND)
|
IF(GLUT_FOUND)
|
||||||
MESSAGE(STATUS "Looking for GLUT - found")
|
MESSAGE(STATUS "Looking for GLUT - found")
|
||||||
ELSE(GLUT_FOUND)
|
ELSE(GLUT_FOUND)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user