diff options
| author | Paul Oppenheim <poppy@lindenlab.com> | 2008-06-16 09:21:51 +0000 |
|---|---|---|
| committer | Paul Oppenheim <poppy@lindenlab.com> | 2008-06-16 09:21:51 +0000 |
| commit | 916f9af25cee5d10aa5d4d432f939ebb826a6773 (patch) | |
| tree | 7134b9239f39bcc5668c5886924f10de3e27e094 /indra/cmake | |
| parent | f540a70546de221b55f0a12b3111902d2ac529a5 (diff) | |
"mac cmake build should not be universal by default" changes. Reviewed by bos.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Variables.cmake | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 7e10f27418..2f30e083d5 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -52,11 +52,22 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - set(ARCH universal) + # set this dynamically from the build system now - + # NOTE: wont have a distributable build unless you add this on the configure line with: + # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' + #set(CMAKE_OSX_ARCHITECTURES i386;ppc) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) + if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") + set(ARCH universal) + else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") + if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") + set(ARCH ppc) + else (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") + set(ARCH i386) + endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") + endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") set(LL_ARCH ${ARCH}_darwin) set(LL_ARCH_DIR ${ARCH}-darwin) - set(CMAKE_OSX_ARCHITECTURES i386;ppc) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |