diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-02 20:35:23 +0300 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-11-02 20:35:23 +0300 |
| commit | 985e784ae899c564eaeb9f30a9f653db4cf81b61 (patch) | |
| tree | c047c1c4aae1f583080c6476486e9f1e55d726ca /CMakeLists.txt | |
| parent | 91fcccc3ad5fd907ebba816797e35199757f2d18 (diff) | |
| parent | 31258507d047d6594a97fc99496855d6d1a83d5b (diff) | |
Merge from trunk -r 24182:24247. Skipped change 24182 (merge of this branch into trunk).
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a649a5e0a8d..b020284f548 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ IF(NOT WITH_GAMEENGINE AND WITH_PLAYER) MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE") ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER) -IF (WITH_OPENCOLLADA) +IF (WITH_OPENCOLLADA AND NOT APPLE) SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory") SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}) SET(OPENCOLLADA_LIB OpenCollada) @@ -101,8 +101,7 @@ SET(PCRE_LIB pcre) SET(EXPAT /usr CACHE FILEPATH "Expat Directory") SET(EXPAT_LIBPATH ${EXPAT}/lib) SET(EXPAT_LIB expat) - -ENDIF (WITH_OPENCOLLADA) +ENDIF (WITH_OPENCOLLADA AND NOT APPLE) # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g: # On Unix: @@ -517,12 +516,28 @@ IF(APPLE) SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing") SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime") ENDIF (WITH_COCOA) + IF(WITH_OPENMP) SET(LLIBS "${LLIBS} -lgomp ") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ") ENDIF(WITH_OPENMP) + IF (WITH_OPENCOLLADA) + SET(OPENCOLLADA ${LIBDIR}/opencollada) + SET(OPENCOLLADA_INC ${OPENCOLLADA}/include) + SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) + SET(OPENCOLLADA_LIB "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2" ) + #pcre is bundled with openCollada + #SET(PCRE ${LIBDIR}/pcre) + #SET(PCRE_LIBPATH ${PCRE}/lib) + SET(PCRE_LIB pcre) + #native OSX libxml2 is used + #SET(EXPAT ${LIBDIR}/expat) + #SET(EXPAT_LIBPATH ${EXPAT}/lib) + #SET(EXPAT_LIB expat) + ENDIF (WITH_OPENCOLLADA) + SET(SDL ${LIBDIR}/sdl) SET(SDL_INCLUDE_DIR ${SDL}/include) SET(SDL_LIBRARY SDL) |