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

FindOpenGL: simplify OS selection code 

This was using nested if's, now it uses elseif to flatten that. It also removes
one "if" from the general "else" branch that checks for Apple, as that has it's
own branch anyway and can't be true at this point.
This commit is contained in:
Rolf Eike Beer 2013-04-17 12:46:13 +02:00
parent f2958ff984
commit b10a1713dc
1 changed files with 85 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/FindOpenGL.cmake
View File

@ -28,7 +28,6 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
if (WIN32)
if (CYGWIN)
find_path(OPENGL_INCLUDE_DIR GL/gl.h )
@ -37,7 +36,7 @@ if (WIN32)
find_library(OPENGL_glu_LIBRARY glu32 )
else ()
elseif (WIN32)
if(BORLAND)
set (OPENGL_gl_LIBRARY import32 CACHE STRING "OpenGL library for win32")
@ -47,11 +46,7 @@ if (WIN32)
set (OPENGL_glu_LIBRARY glu32 CACHE STRING "GLU library for win32")
endif()
endif ()
else ()
if (APPLE)
elseif (APPLE)
find_library(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL lib for OSX")
find_library(OPENGL_glu_LIBRARY AGL DOC "AGL lib for OSX")
@ -111,18 +106,15 @@ else ()
# On Unix OpenGL most certainly always requires X11.
# Feel free to tighten up these conditions if you don't
# think this is always true.
# It's not true on OSX.
if (OPENGL_gl_LIBRARY)
if(NOT X11_FOUND)
include(${CMAKE_CURRENT_LIST_DIR}/FindX11.cmake)
endif()
if (X11_FOUND)
if (NOT APPLE)
set (OPENGL_LIBRARIES ${X11_LIBRARIES})
endif ()
endif ()
endif ()
find_library(OPENGL_glu_LIBRARY
NAMES GLU MesaGLU
@ -133,7 +125,6 @@ else ()
)
endif ()
endif ()
if(OPENGL_gl_LIBRARY)