kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindOpenGL-no-X11' 

d051cbda FindOpenGL: Drop explicit dependency on X11 (#15268)
This commit is contained in:
Brad King 2014-12-02 10:21:22 -05:00 committed by CMake Topic Stage
parent 5bc8282898 d051cbda5d
commit c3c251ce0a
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Help/release/dev/FindOpenGL-no-X11.rst Normal file
View File

@ -0,0 +1,8 @@
FindOpenGL-no-X11
-----------------
* The :module:`FindOpenGL` module no longer explicitly searches
for any dependency on X11 libraries with the :module:`FindX11`
module. Such dependencies should not need to be explicit.
Applications using X11 APIs themselves should find and link
to X11 libraries explicitly.

13
Modules/FindOpenGL.cmake
View File

@ -138,19 +138,6 @@ else()
unset(_OPENGL_INCLUDE_PATH) unset(_OPENGL_INCLUDE_PATH)
unset(_OPENGL_LIB_PATH) unset(_OPENGL_LIB_PATH)
# On Unix OpenGL most certainly always requires X11.
# Feel free to tighten up these conditions if you don't
# think this is always true.
if (OPENGL_gl_LIBRARY)
if(NOT X11_FOUND)
include(${CMAKE_CURRENT_LIST_DIR}/FindX11.cmake)
endif()
if (X11_FOUND)
set (OPENGL_LIBRARIES ${X11_LIBRARIES})
endif ()
endif ()
find_library(OPENGL_glu_LIBRARY find_library(OPENGL_glu_LIBRARY
NAMES GLU MesaGLU NAMES GLU MesaGLU
PATHS ${OPENGL_gl_LIBRARY} PATHS ${OPENGL_gl_LIBRARY}