Skip to content
Snippets Groups Projects
Commit aa633472 authored by drausch's avatar drausch
Browse files

FIX: FindVGlut now prefers freeglut over glut in all occasions

FIX: FindVGlut properly re-searches GLUT_LIBRARIES if variable is cleared

git-svn-id: https://svn.rwth-aachen.de/repos/vrgroup-svn/projects/VistaCMakeCommon/trunk@30494 33c38b33-09d2-4561-8d4d-1bfa2f58f885
parent 3f2927ae
Branches
No related tags found
No related merge requests found
...@@ -10,7 +10,10 @@ if( NOT VGLUT_FOUND ) ...@@ -10,7 +10,10 @@ if( NOT VGLUT_FOUND )
# Glut was not found yet in prior config runs # Glut was not found yet in prior config runs
# first, check if we find the root dir on our own # first, check if we find the root dir on our own
vista_find_package_root( GLUT "include/GL/freeglut.h" NAMES freeglut glut OpenSG )
if( NOT GLUT_ROOT_DIR )
vista_find_package_root( GLUT "include/GL/glut.h" NAMES freeglut glut OpenSG ) vista_find_package_root( GLUT "include/GL/glut.h" NAMES freeglut glut OpenSG )
endif()
set( GLUT_LIBRARIES "GLUT_LIBRARIES-NOTFOUND" ) set( GLUT_LIBRARIES "GLUT_LIBRARIES-NOTFOUND" )
find_library( GLUT_LIBRARIES NAMES freeglut freeglut-msvc90x86 glut glut32 find_library( GLUT_LIBRARIES NAMES freeglut freeglut-msvc90x86 glut glut32
...@@ -22,6 +25,7 @@ if( NOT VGLUT_FOUND ) ...@@ -22,6 +25,7 @@ if( NOT VGLUT_FOUND )
set( GLUT_INCLUDE_DIRS "${GLUT_ROOT_DIR}/include" ) set( GLUT_INCLUDE_DIRS "${GLUT_ROOT_DIR}/include" )
get_filename_component( GLUT_LIBRARY_DIRS ${GLUT_LIBRARIES} PATH ) get_filename_component( GLUT_LIBRARY_DIRS ${GLUT_LIBRARIES} PATH )
set( GLUT_FOUND_BY_DEFAULT_MODULE FALSE CACHE INTERNAL "" FORCE )
else( GLUT_ROOT_DIR AND GLUT_LIBRARIES ) else( GLUT_ROOT_DIR AND GLUT_LIBRARIES )
...@@ -41,6 +45,9 @@ if( NOT VGLUT_FOUND ) ...@@ -41,6 +45,9 @@ if( NOT VGLUT_FOUND )
# we already found glut on prior config run -> GLUT_ROOT_DIR is set # we already found glut on prior config run -> GLUT_ROOT_DIR is set
# we now have to differentiate between custom found, or with native find_glut # we now have to differentiate between custom found, or with native find_glut
if( NOT GLUT_FOUND_BY_DEFAULT_MODULE ) if( NOT GLUT_FOUND_BY_DEFAULT_MODULE )
if( NOT GLUT_LIBRARIES )
set( GLUT_LIBRARIES "GLUT_LIBRARIES-NOTFOUND" )
endif()
find_library( GLUT_LIBRARIES NAMES freeglut freeglut-msvc90x86 glut glut32 find_library( GLUT_LIBRARIES NAMES freeglut freeglut-msvc90x86 glut glut32
PATHS "${GLUT_ROOT_DIR}/lib" "${GLUT_ROOT_DIR}/lib/opt" PATHS "${GLUT_ROOT_DIR}/lib" "${GLUT_ROOT_DIR}/lib/opt"
NO_DEFAULT_PATH NO_DEFAULT_PATH
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment