diff options
author | Jacques Beuarain <jacques.beaurain@gmail.com> | 2006-11-30 14:59:59 +0300 |
---|---|---|
committer | Jacques Beuarain <jacques.beaurain@gmail.com> | 2006-11-30 14:59:59 +0300 |
commit | 01ab6d6f752a0cf94f2003ac1f9286a539c45c61 (patch) | |
tree | af18222619364932c25ebfadcb105feee6420015 /CMakeLists.txt | |
parent | 7ac6c38f5bca85685ff10b28167f018b655e794e (diff) |
CMake: Detect PPC compilation on Mac OSX and use correct libs. Also add OpenEXR thread lib because it may be needed on Intel compiles for people not using the libs in CVS.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 74ff9e462c6..76ef9961fa0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -263,7 +263,11 @@ IF(WIN32) ENDIF(WIN32) IF(APPLE) - SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386) + IF(CMAKE_OSX_ARCHITECTURES MATCHES i386) + SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386) + ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386) + SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc) + ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386) INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake) IF(OPENAL_FOUND) @@ -301,7 +305,11 @@ IF(APPLE) SET(OPENEXR ${LIBDIR}/openexr) SET(OPENEXR_INC ${OPENEXR}/include/OpenEXR) - SET(OPENEXR_LIB Iex Half IlmImf Imath) + IF(CMAKE_OSX_ARCHITECTURES MATCHES i386) + SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread) + ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386) + SET(OPENEXR_LIB Iex Half IlmImf Imath) + ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386) SET(OPENEXR_LIBPATH ${OPENEXR}/lib) SET(LLIBS stdc++ SystemStubs) |