diff options
| author | Aura Linden <aura@lindenlab.com> | 2012-08-17 09:04:16 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2012-08-17 09:04:16 -0700 |
| commit | 3e05f169d68639d304c75cb464e05f27206b4739 (patch) | |
| tree | 65a3f3e22d3ffe746db2383e345856779b22cca0 | |
| parent | efdcf045b064335aa180f03bae58916af19e2169 (diff) | |
Minor change required for merge from viewer-development
| -rw-r--r-- | indra/cmake/Variables.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index c117873d4c..3542fb0610 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -106,13 +106,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # To support a different SDK update these Xcode settings: if (XCODE_VERSION GREATER 4.2) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) - set(CMAKE_OSX_SYSROOT macosx10.6) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") else (XCODE_VERSION GREATER 4.2) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") endif (XCODE_VERSION GREATER 4.2) + + set(CMAKE_OSX_SYSROOT macosx10.6) + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) |