songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added FindOpenGL.cmake stub to fix Mac Leopard's OpenGL.

This commit is contained in:
Fernando Cacciola 2008-08-25 19:17:09 +00:00
parent 81c0e4510b
commit cc3f3fbe4a
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1639,6 +1639,7 @@ Installation/cmake/modules/FindCORE.cmake -text
Installation/cmake/modules/FindGMP.cmake -text
Installation/cmake/modules/FindGMPXX.cmake -text
Installation/cmake/modules/FindMPFR.cmake -text
Installation/cmake/modules/FindOpenGL.cmake -text
Installation/cmake/modules/FindPackageHandleStandardArgs.cmake -text
Installation/cmake/modules/FindQGLViewer.cmake -text
Installation/cmake/modules/FindTAUCS.cmake -text

2
Installation/CMakeLists.txt
View File

@ -17,6 +17,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR)
# Where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CGAL_CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
set(ORIGINAL_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} )
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CGAL_CMAKE_MODULE_PATH} )
# This allows else(), endif(), etc... (without repeating the expression)

17
Installation/cmake/modules/FindOpenGL.cmake Normal file
View File

@ -0,0 +1,17 @@
if ( NOT FIND_OPENGL_WRAPPER )
set ( FIND_OPENGL_WRAPPER 1 )
set(SAVED_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} )
set(CMAKE_MODULE_PATH ${ORIG_CMAKE_MODULE_PATH} )
find_package(OpenGL)
if ( OPENGL_FOUND AND APPLE_LEOPARD )
set (CMAKE_SHARED_LINKER_FLAGS "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
endif()
set(CMAKE_MODULE_PATH ${SAVED_CMAKE_MODULE_PATH} )
endif()

11
Installation/cmake/modules/GeneratorSpecificSettings.cmake
View File

@ -29,6 +29,17 @@ set( GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED 1 )
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -library=stlport4" )
endif()
# From james Bigler, in the cmake users list.
IF (APPLE)
exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION)
string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
message(STATUS "DARWIN_VERSION=${DARWIN_VERSION}")
if (DARWIN_VERSION GREATER 8)
message(STATUS "Mac Leopard detected")
set(APPLE_LEOPARD 1)
endif()
endif()
if ( CMAKE_BUILD_TYPE )
# If a build type is specified, VC project files contain only a configurartion for that build type