diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-17 17:49:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-12-20 14:47:41 (GMT) |
| commit | 924b2999a1c2cf8aa8621904f8db9e488bbcf2c8 (patch) | |
| tree | a4e4da1a59313df24d89499b0362a176c0a43ae4 | |
| parent | ece1900731a236fbb92ce89a8e47d09b1a6459a0 (diff) | |
| download | CMake-924b2999a1c2cf8aa8621904f8db9e488bbcf2c8.zip CMake-924b2999a1c2cf8aa8621904f8db9e488bbcf2c8.tar.gz CMake-924b2999a1c2cf8aa8621904f8db9e488bbcf2c8.tar.bz2 | |
FindGLUT: Move mark_as_advanced calls closer to find calls
| -rw-r--r-- | Modules/FindGLUT.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake index 636f1ea..17d2f3d 100644 --- a/Modules/FindGLUT.cmake +++ b/Modules/FindGLUT.cmake @@ -82,6 +82,7 @@ endif() if(WIN32) find_path( GLUT_INCLUDE_DIR NAMES GL/glut.h PATHS ${GLUT_ROOT_PATH}/include ) + mark_as_advanced(GLUT_INCLUDE_DIR) find_library( GLUT_glut_LIBRARY_RELEASE NAMES glut glut32 freeglut PATHS ${OPENGL_LIBRARY_DIR} @@ -96,6 +97,7 @@ if(WIN32) select_library_configurations(GLUT_glut) elseif(APPLE) find_path(GLUT_INCLUDE_DIR glut.h ${OPENGL_LIBRARY_DIR}) + mark_as_advanced(GLUT_INCLUDE_DIR) find_library(GLUT_glut_LIBRARY GLUT DOC "GLUT library for OSX") find_library(GLUT_cocoa_LIBRARY Cocoa DOC "Cocoa framework for OSX") mark_as_advanced(GLUT_glut_LIBRARY GLUT_cocoa_LIBRARY) @@ -152,16 +154,17 @@ else() /opt/graphics/OpenGL/contrib/libglut ${_GLUT_INC_DIR} ) + mark_as_advanced(GLUT_INCLUDE_DIR) find_library( GLUT_glut_LIBRARY glut /usr/openwin/lib ${_GLUT_glut_LIB_DIR} ) + mark_as_advanced(GLUT_glut_LIBRARY) unset(_GLUT_INC_DIR) unset(_GLUT_glut_LIB_DIR) endif() -mark_as_advanced(GLUT_glut_LIBRARY) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLUT REQUIRED_VARS GLUT_glut_LIBRARY GLUT_INCLUDE_DIR) @@ -229,5 +232,3 @@ if (GLUT_FOUND) set (GLUT_LIBRARY ${GLUT_LIBRARIES}) set (GLUT_INCLUDE_PATH ${GLUT_INCLUDE_DIR}) endif() - -mark_as_advanced(GLUT_INCLUDE_DIR) |