From c46db2fa156e6a774d1ec4b81cbfb29dfc059c54 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 3 Oct 2007 23:01:33 +0000 Subject: [PATCH] Added support for defining an option OSG_GLU_TESS_CALLBACK_TRIPLEDOT within the CMake build system, enabling this option will build the OSG against the (...) version of the tesselation callback functions. One can also set the default value of this option via the DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT variable that is set locally to OFF for all platforms except AIX and OSX, but can be overriden by setting it via command line option i.e. cmake . -DDDEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT=ON --- CMakeLists.txt | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cdaa46b6d..7241a1b0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,10 +98,26 @@ INCLUDE_DIRECTORIES( #ADD_DEFINITIONS(-D) # Platform specific definitions +IF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT) -IF (CMAKE_SYSTEM MATCHES "AIX.*") + SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT OFF) + + IF (CMAKE_SYSTEM MATCHES "AIX.*") + SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT ON) + ENDIF(CMAKE_SYSTEM MATCHES "AIX.*") + + IF (APPLE) + SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT ON) + ENDIF(APPLE) + +ENDIF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT) + +OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build build with (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT}) + +IF (OSG_GLU_TESS_CALLBACK_TRIPLEDOT) ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT) -ENDIF(CMAKE_SYSTEM MATCHES "AIX.*") +ENDIF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT) + IF(WIN32) ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)