diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-09-29 15:32:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-09-29 15:32:01 -0400 |
| commit | 9367a3787929dfff8b46763d9a7b4872c469e85a (patch) | |
| tree | db0351a86ebfa362ba8c4314e0db1141fbb46450 /indra/cmake/Variables.cmake | |
| parent | be9b1ee8afacabb64f82640de5f80ce9438e6c91 (diff) | |
| parent | 17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff) | |
merge changes for XCODE-7
Diffstat (limited to 'indra/cmake/Variables.cmake')
| -rwxr-xr-x | indra/cmake/Variables.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 76d92d7a48..2fb47c58a7 100755 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -130,10 +130,10 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - # now we only support Xcode 6.0 using 10.9 (Mavericks), minimum OS 10.7 (Lion) - set(XCODE_VERSION 6.0) + # now we only support Xcode 7.0 using 10.11 (El Capitan), minimum OS 10.7 (Lion) + set(XCODE_VERSION 7.0) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7) - set(CMAKE_OSX_SYSROOT macosx10.9) + set(CMAKE_OSX_SYSROOT macosx10.11) set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0") set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL 3) |