Do not use custom FindGLUT cmake script.

castano · Jan 27, 2009 · 1c6b65a · 1c6b65a
1 parent f92a219
commit 1c6b65a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 134 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,8 @@ IF(WIN32)
 	SET(GNUWIN32 "${NV_SOURCE_DIR}/extern/gnuwin32")
 	SET(CMAKE_INCLUDE_PATH "${GNUWIN32}/include")
 	SET(CMAKE_LIBRARY_PATH "${GNUWIN32}/lib")
+
+	SET(GLUT_ROOT_PATH "${NV_SOURCE_DIR}/extern/glut")
 ENDIF(WIN32)
 
 INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)

diff --git a/cmake/FindGLUT.cmake b/cmake/FindGLUT.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -15,8 +15,7 @@ ELSE(OPENGL_FOUND)
 ENDIF(OPENGL_FOUND)
 
 # GLUT
-INCLUDE(${NV_CMAKE_DIR}/FindGLUT.cmake)
-#INCLUDE(FindGLUT)
+INCLUDE(FindGLUT)
 IF(GLUT_FOUND)
 	MESSAGE(STATUS "Looking for GLUT - found")
 ELSE(GLUT_FOUND)