Changeset 6474
- Timestamp:
- 04/11/07 10:33:40
- Files:
-
- OpenSceneGraph/trunk/CMakeLists.txt (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
OpenSceneGraph/trunk/CMakeLists.txt
r6430 r6474 13 13 #SET(CMAKE_LIBRARY_PATH "${OpenSceneGraph_SOURCE_DIR}/../3rdParty/lib;${CMAKE_LIBRARY_PATH}") 14 14 IF(USING_OSG_OP_OT_TRIPLE_SET) 15 16 15 SET(CMAKE_INCLUDE_PATH "${OpenSceneGraph_SOURCE_DIR}/../../3rdParty/include;${CMAKE_INCLUDE_PATH}") 16 SET(CMAKE_LIBRARY_PATH "${OpenSceneGraph_SOURCE_DIR}/../../3rdParty/lib;${CMAKE_LIBRARY_PATH}") 17 17 ENDIF(USING_OSG_OP_OT_TRIPLE_SET) 18 18 … … 32 32 33 33 IF(USING_OSG_OP_OT_TRIPLE_SET) 34 35 36 37 38 39 40 41 42 43 34 # MESSAGE("OSG: Using TripleSet, ${OpenThreads_SOURCE_DIR}.") 35 # So I think the fall-out is that all the OpenThreads variables 36 # that have been set are still in play. So the include paths are still 37 # visible, and the library is still set. 38 # To keep the same code paths 39 SET(OPENTHREADS_LIBRARY OpenThreads) 40 SET(OPENTHREADS_INCLUDE_DIR ${OpenThreads_SOURCE_DIR}/include) 41 42 # MESSAGE("Lib: ${OPENTHREADS_LIBRARY}") 43 44 44 45 45 ELSE(USING_OSG_OP_OT_TRIPLE_SET) 46 # 47 46 # MESSAGE("OSG: Not using Triple Set") 47 FIND_PACKAGE(OpenThreads REQUIRED) 48 48 49 49 ENDIF(USING_OSG_OP_OT_TRIPLE_SET) … … 62 62 FIND_PACKAGE(Threads) 63 63 IF(CMAKE_SYSTEM MATCHES IRIX) 64 65 SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "") 64 # Erase CMAKE_THREAD_LIBS_INIT and hope it works 65 SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "") 66 66 ENDIF(CMAKE_SYSTEM MATCHES IRIX) 67 67 … … 71 71 72 72 IF(APPLE) 73 74 73 FIND_LIBRARY(CARBON_LIBRARY Carbon) 74 FIND_LIBRARY(COCOA_LIBRARY Cocoa) 75 75 ENDIF(APPLE) 76 76 77 77 IF(UNIX) 78 79 80 81 82 78 # Not sure what this will do on Cygwin and Msys 79 # Also, remember OS X X11 is a user installed option so it may not exist. 80 FIND_PACKAGE(X11) 81 # Some Unicies need explicit linkage to the Math library or the build fails. 82 FIND_LIBRARY(MATH_LIBRARY m) 83 83 ENDIF(UNIX) 84 84 85 85 # Make the headers visible to everything 86 86 INCLUDE_DIRECTORIES( 87 88 89 87 ${OpenSceneGraph_SOURCE_DIR}/include 88 ${OPENTHREADS_INCLUDE_DIR} 89 ${OPENGL_INCLUDE_DIR} 90 90 ) 91 91 92 92 # Common global definitions 93 93 #ADD_DEFINITIONS(-D) … … 95 95 96 96 IF(WIN32) 97 98 99 100 101 102 97 #needed for net plugin 98 SET (OSG_SOCKET_LIBS wsock32.lib) 99 # Both Cygwin and Msys need -DNOMINMAX ??? 100 IF(UNIX) 101 ADD_DEFINITIONS(-DNOMINMAX) 102 ENDIF(UNIX) 103 103 ENDIF(WIN32) 104 104 … … 110 110 #luigi#SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE) 111 111 #luigi#IF(UNIX) 112 #luigi# 113 #luigi# 114 #luigi# 115 #luigi# 116 #luigi# 117 #luigi# 118 #luigi# 119 #luigi# 120 #luigi# 112 #luigi# LIST_CONTAINS(contains "g++" ${CMAKE_CXX_COMPILER_LIST}) 113 #luigi# IF (contains) 114 #luigi# MESSAGE(${MY_MESSAGE_DEFAULT} "${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} setting CMAKE_CXX_COMPILER to g++") 115 #luigi# SET(CMAKE_CXX_COMPILER "g++") 116 #luigi# SET(CMAKE_CXX_COMPILER_LOADED 2) 117 #luigi# SET(CMAKE_CXX_COMPILER_WORKS 2) 118 #luigi# ENDIF (contains) 119 #luigi# SET(CMAKE_CXX_FLAGS_RELEASE "-O2") 120 #luigi# SET(CMAKE_CXX_FLAGS_DEBUG "-ggdb -gstabs") 121 121 #luigi#ENDIF(UNIX) 122 122 ######################################################################################################## … … 127 127 # 3rd Party Dependency Stuff 128 128 IF(WIN32) 129 129 INCLUDE(Find3rdPartyDependencies) 130 130 ENDIF(WIN32) 131 131 … … 154 154 # can use Quicktime. 155 155 IF(NOT APPLE) 156 157 158 159 160 161 162 163 164 165 156 FIND_PACKAGE(GIFLIB) 157 FIND_PACKAGE(JPEG) 158 FIND_PACKAGE(PNG) 159 FIND_PACKAGE(TIFF) 160 161 # QuickTime is required for OS X, but optional for Windows. 162 IF(WIN32) 163 FIND_PACKAGE(QuickTime) 164 ENDIF(WIN32) 165 166 166 ELSE(NOT APPLE) 167 167 FIND_PACKAGE(QuickTime) 168 168 ENDIF(NOT APPLE) 169 169 … … 185 185 IF(UNIX AND NOT WIN32 AND NOT APPLE) 186 186 IF(CMAKE_SIZEOF_VOID_P MATCHES "8") 187 187 SET(LIB_POSTFIX "64") 188 188 ENDIF(CMAKE_SIZEOF_VOID_P MATCHES "8") 189 189 ENDIF(UNIX AND NOT WIN32 AND NOT APPLE) … … 213 213 OPTION(DYNAMIC_OPENSCENEGRAPH "Set to ON to build OpenSceneGraph for dynamic linking. Use OFF for static." ON) 214 214 IF (DYNAMIC_OPENSCENEGRAPH) 215 215 SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED") 216 216 ELSE (DYNAMIC_OPENSCENEGRAPH) 217 217 SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC") 218 218 ENDIF(DYNAMIC_OPENSCENEGRAPH) 219 219 … … 225 225 OPTION(BUILD_OSG_APPLICATIONS "Enable to build OSG Applications (e.g. osgviewer)" ON) 226 226 IF (BUILD_OSG_APPLICATIONS) 227 227 ADD_SUBDIRECTORY(applications) 228 228 ENDIF(BUILD_OSG_APPLICATIONS) 229 229 … … 231 231 OPTION(BUILD_OSG_EXAMPLES "Enable to build OSG Examples" OFF) 232 232 IF (BUILD_OSG_EXAMPLES) 233 233 ADD_SUBDIRECTORY(examples) 234 234 ENDIF(BUILD_OSG_EXAMPLES) 235 235 … … 244 244 # and then do the equivalent of "make DoxygenDoc". 245 245 IF(BUILD_DOCUMENTATION) 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 246 IF(DOT) 247 SET(HAVE_DOT YES) 248 ELSE(DOT) 249 SET(HAVE_DOT NO) 250 ENDIF(DOT) 251 # This processes our Doxyfile.in and substitutes paths to generate 252 # a final Doxyfile 253 CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/doxyfile.cmake 254 ${PROJECT_BINARY_DIR}/doc/doxyfile 255 ) 256 # This creates a new target to build documentation. 257 # It runs ${DOXYGEN} which is the full path and executable to 258 # Doxygen on your system, set by the FindDoxygen.cmake module 259 # (called by FindDocumentation.cmake). 260 # It runs the final generated Doxyfile against it. 261 # The DOT_PATH is substituted into the Doxyfile. 262 ADD_CUSTOM_TARGET(DoxygenDoc ${DOXYGEN} 263 ${PROJECT_BINARY_DIR}/docs/doxyfile 264 ) 265 265 ENDIF(BUILD_DOCUMENTATION) 266 266
