From 01ab6d6f752a0cf94f2003ac1f9286a539c45c61 Mon Sep 17 00:00:00 2001 From: Jacques Beuarain Date: Thu, 30 Nov 2006 11:59:59 +0000 Subject: 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. --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') 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) -- cgit v1.2.3