diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-09-19 13:13:37 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-09-19 13:13:37 -0400 |
| commit | eaef5e63d5f5e3177fbd13de41aea12340f2fa30 (patch) | |
| tree | 4da9c9af2741b2d33eb05cebe0291e50aada88ba /indra/cmake | |
| parent | 195d319f65239238577ae15c22188da3839ae5cf (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Merge. Pull in viewer-release after materials viewer release.
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | indra/cmake/Variables.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 7c310ba9c3..22d0a7f0fe 100755 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -134,15 +134,20 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OUTPUT_VARIABLE XCODE_VERSION ) # To support a different SDK update these Xcode settings: + if (XCODE_VERSION GREATER 4.5) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8) + set(CMAKE_OSX_SYSROOT macosx10.8) + else (XCODE_VERSION GREATER 4.5) if (XCODE_VERSION GREATER 4.2) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) + set(CMAKE_OSX_SYSROOT macosx10.7) else (XCODE_VERSION GREATER 4.2) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6) + set(CMAKE_OSX_SYSROOT macosx10.7) endif (XCODE_VERSION GREATER 4.2) + endif (XCODE_VERSION GREATER 4.5) - 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) # NOTE: To attempt an i386/PPC Universal build, add this on the configure line: |