Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 14:08:35 +08:00
Code Issues Projects Releases Wiki Activity

FindOpenGL: only mark declared cache variables as advanced

Browse Source
This commit is contained in:
Ben Boeckel
2019-12-19 12:51:04 -05:00
parent 7cc02a0c29
commit 7e2ae4e96d
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Modules/FindOpenGL.cmake
View File

@@ -130,6 +130,8 @@ foreach(component ${OpenGL_FIND_COMPONENTS})
set(OPENGL_USE_${_COMPONENT} 1) set(OPENGL_USE_${_COMPONENT} 1)
endforeach() endforeach()
set(_OpenGL_CACHE_VARS)
if (CYGWIN) if (CYGWIN)
find_path(OPENGL_INCLUDE_DIR GL/gl.h ) find_path(OPENGL_INCLUDE_DIR GL/gl.h )
list(APPEND _OpenGL_REQUIRED_VARS OPENGL_INCLUDE_DIR) list(APPEND _OpenGL_REQUIRED_VARS OPENGL_INCLUDE_DIR)
@@ -137,6 +139,11 @@ if (CYGWIN)
find_library(OPENGL_gl_LIBRARY opengl32 ) find_library(OPENGL_gl_LIBRARY opengl32 )
find_library(OPENGL_glu_LIBRARY glu32 ) find_library(OPENGL_glu_LIBRARY glu32 )
list(APPEND _OpenGL_CACHE_VARS
OPENGL_INCLUDE_DIR
OPENGL_gl_LIBRARY
OPENGL_glu_LIBRARY
)
elseif (WIN32) elseif (WIN32)
if(BORLAND) if(BORLAND)
@@ -147,6 +154,10 @@ elseif (WIN32)
set (OPENGL_glu_LIBRARY glu32 CACHE STRING "GLU library for win32") set (OPENGL_glu_LIBRARY glu32 CACHE STRING "GLU library for win32")
endif() endif()
list(APPEND _OpenGL_CACHE_VARS
OPENGL_gl_LIBRARY
OPENGL_glu_LIBRARY
)
elseif (APPLE) elseif (APPLE)
# The OpenGL.framework provides both gl and glu # The OpenGL.framework provides both gl and glu
find_library(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL library for OS X") find_library(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL library for OS X")
@@ -155,6 +166,11 @@ elseif (APPLE)
find_path(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OS X") find_path(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OS X")
list(APPEND _OpenGL_REQUIRED_VARS OPENGL_INCLUDE_DIR) list(APPEND _OpenGL_REQUIRED_VARS OPENGL_INCLUDE_DIR)
list(APPEND _OpenGL_CACHE_VARS
OPENGL_INCLUDE_DIR
OPENGL_gl_LIBRARY
OPENGL_glu_LIBRARY
)
else() else()
if (CMAKE_SYSTEM_NAME MATCHES "HP-UX") if (CMAKE_SYSTEM_NAME MATCHES "HP-UX")
# Handle HP-UX cases where we only want to find OpenGL in either hpux64 # Handle HP-UX cases where we only want to find OpenGL in either hpux64
@@ -194,6 +210,12 @@ else()
/usr/openwin/share/include /usr/openwin/share/include
/opt/graphics/OpenGL/include /opt/graphics/OpenGL/include
) )
list(APPEND _OpenGL_CACHE_VARS
OPENGL_INCLUDE_DIR
OPENGL_GLX_INCLUDE_DIR
OPENGL_EGL_INCLUDE_DIR
OPENGL_xmesa_INCLUDE_DIR
)
# Search for the GLVND libraries. We do this regardless of COMPONENTS; we'll # Search for the GLVND libraries. We do this regardless of COMPONENTS; we'll
# take into account the COMPONENTS logic later. # take into account the COMPONENTS logic later.
@@ -222,6 +244,13 @@ else()
/usr/shlib /usr/shlib
) )
list(APPEND _OpenGL_CACHE_VARS
OPENGL_opengl_LIBRARY
OPENGL_glx_LIBRARY
OPENGL_egl_LIBRARY
OPENGL_glu_LIBRARY
)
set(_OpenGL_GL_POLICY_WARN 0) set(_OpenGL_GL_POLICY_WARN 0)
if(NOT DEFINED OpenGL_GL_PREFERENCE) if(NOT DEFINED OpenGL_GL_PREFERENCE)
set(OpenGL_GL_PREFERENCE "") set(OpenGL_GL_PREFERENCE "")
@@ -268,6 +297,7 @@ else()
${_OPENGL_LIB_PATH} ${_OPENGL_LIB_PATH}
PATH_SUFFIXES libglvnd PATH_SUFFIXES libglvnd
) )
list(APPEND _OpenGL_CACHE_VARS OPENGL_gl_LIBRARY)
endif() endif()
if(_OpenGL_GL_POLICY_WARN AND OPENGL_gl_LIBRARY AND OPENGL_opengl_LIBRARY AND OPENGL_glx_LIBRARY) if(_OpenGL_GL_POLICY_WARN AND OPENGL_gl_LIBRARY AND OPENGL_opengl_LIBRARY AND OPENGL_glx_LIBRARY)
@@ -532,14 +562,5 @@ set(OPENGL_LIBRARY ${OPENGL_LIBRARIES})
# This deprecated setting is for backward compatibility with CMake1.4 # This deprecated setting is for backward compatibility with CMake1.4
set(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR}) set(OPENGL_INCLUDE_PATH ${OPENGL_INCLUDE_DIR})
mark_as_advanced( mark_as_advanced(${_OpenGL_CACHE_VARS})
OPENGL_INCLUDE_DIR unset(_OpenGL_CACHE_VARS)
OPENGL_xmesa_INCLUDE_DIR
OPENGL_egl_LIBRARY
OPENGL_glu_LIBRARY
OPENGL_glx_LIBRARY
OPENGL_gl_LIBRARY
OPENGL_opengl_LIBRARY
OPENGL_EGL_INCLUDE_DIR
OPENGL_GLX_INCLUDE_DIR
)