From: <tks...@us...> - 2010-01-13 17:28:06
|
Revision: 4885 http://hugin.svn.sourceforge.net/hugin/?rev=4885&view=rev Author: tksharpless Date: 2010-01-13 17:27:58 +0000 (Wed, 13 Jan 2010) Log Message: ----------- Also finds glut.h, glutxx.lib directly under ${GLUT_ROOT_PATH} Modified Paths: -------------- hugin/trunk/CMakeModules/FindGLUT.cmake Modified: hugin/trunk/CMakeModules/FindGLUT.cmake =================================================================== --- hugin/trunk/CMakeModules/FindGLUT.cmake 2010-01-13 09:58:07 UTC (rev 4884) +++ hugin/trunk/CMakeModules/FindGLUT.cmake 2010-01-13 17:27:58 UTC (rev 4885) @@ -1,85 +1,87 @@ -# - 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_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) - FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h - PATHS ${GLUT_ROOT_PATH}/include ) - FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32 - PATHS - ${OPENGL_LIBRARY_DIR} - ${GLUT_ROOT_PATH}/Release - ) -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/GL - /usr/openwin/share/include - /usr/openwin/include - /opt/graphics/OpenGL/include - /opt/graphics/OpenGL/contrib/libglut - ) - - FIND_LIBRARY( GLUT_glut_LIBRARY glut - /usr/openwin/lib - ) - - FIND_LIBRARY( GLUT_Xi_LIBRARY Xi - /usr/openwin/lib - ) - - FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu - /usr/openwin/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) - -IF (GLUT_FOUND) - MESSAGE(STATUS "GLUT Found") -ELSE (GLUT_FOUND) - MESSAGE(FATAL_ERROR "Could not find GLUT") -ENDIF (GLUT_FOUND) - -MARK_AS_ADVANCED( - GLUT_INCLUDE_DIR - GLUT_glut_LIBRARY - GLUT_Xmu_LIBRARY - GLUT_Xi_LIBRARY - ) +# - 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_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) + FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h glut.h + PATHS ${GLUT_ROOT_PATH} + ${GLUT_ROOT_PATH}/include ) + FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32 + PATHS + ${OPENGL_LIBRARY_DIR} + ${GLUT_ROOT_PATH} + ${GLUT_ROOT_PATH}/Release + ) +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/GL + /usr/openwin/share/include + /usr/openwin/include + /opt/graphics/OpenGL/include + /opt/graphics/OpenGL/contrib/libglut + ) + + FIND_LIBRARY( GLUT_glut_LIBRARY glut + /usr/openwin/lib + ) + + FIND_LIBRARY( GLUT_Xi_LIBRARY Xi + /usr/openwin/lib + ) + + FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu + /usr/openwin/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) + +IF (GLUT_FOUND) + MESSAGE(STATUS "GLUT Found") +ELSE (GLUT_FOUND) + MESSAGE(FATAL_ERROR "Could not find GLUT") +ENDIF (GLUT_FOUND) + +MARK_AS_ADVANCED( + GLUT_INCLUDE_DIR + GLUT_glut_LIBRARY + GLUT_Xmu_LIBRARY + GLUT_Xi_LIBRARY + ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-14 16:35:17
|
Revision: 4890 http://hugin.svn.sourceforge.net/hugin/?rev=4890&view=rev Author: tksharpless Date: 2010-01-14 16:35:09 +0000 (Thu, 14 Jan 2010) Log Message: ----------- My previous change broke build. Now fixed. Modified Paths: -------------- hugin/trunk/CMakeModules/FindGLUT.cmake Modified: hugin/trunk/CMakeModules/FindGLUT.cmake =================================================================== --- hugin/trunk/CMakeModules/FindGLUT.cmake 2010-01-13 20:25:15 UTC (rev 4889) +++ hugin/trunk/CMakeModules/FindGLUT.cmake 2010-01-14 16:35:09 UTC (rev 4890) @@ -8,14 +8,15 @@ # GLUT_Xi_LIBRARY = the full path to the Xi Library. IF (WIN32) - FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h glut.h + FIND_PATH( GLUT_INCLUDE_DIR NAMES GL/glut.h PATHS ${GLUT_ROOT_PATH} ${GLUT_ROOT_PATH}/include ) - FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32 + FIND_LIBRARY( GLUT_glut_LIBRARY NAMES glut glut32 freeglut PATHS ${OPENGL_LIBRARY_DIR} ${GLUT_ROOT_PATH} ${GLUT_ROOT_PATH}/Release + ${GLUT_ROOT_PATH}/lib ) ELSE (WIN32) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-05-15 07:04:26
|
Revision: 5158 http://hugin.svn.sourceforge.net/hugin/?rev=5158&view=rev Author: tmodes Date: 2010-05-15 07:04:19 +0000 (Sat, 15 May 2010) Log Message: ----------- Improved finding of freeglut for 64 bit version (Tom Glastonbury) Modified Paths: -------------- hugin/trunk/CMakeModules/FindGLUT.cmake Modified: hugin/trunk/CMakeModules/FindGLUT.cmake =================================================================== --- hugin/trunk/CMakeModules/FindGLUT.cmake 2010-05-14 17:28:58 UTC (rev 5157) +++ hugin/trunk/CMakeModules/FindGLUT.cmake 2010-05-15 07:04:19 UTC (rev 5158) @@ -20,6 +20,8 @@ ${SOURCE_BASE_DIR}/glut/lib/Release ${SOURCE_BASE_DIR}/freeglut-2.6.0/VisualStudio2008/Release ${SOURCE_BASE_DIR}/freeglut-2.6.0/VisualStudio2008Static/Release + ${SOURCE_BASE_DIR}/freeglut-2.6.0/VisualStudio2008/x64/Release + ${SOURCE_BASE_DIR}/freeglut-2.6.0/VisualStudio2008Static/x64/Release ) IF(NOT ${HUGIN_SHARED}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |