diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2015-10-01 09:02:45 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2015-10-01 09:02:45 -0700 |
| commit | d3928405e3498fabd9215da96fcd0d72e71e83e1 (patch) | |
| tree | 218b97ae3d0173a9b8c106c09306aef03f42c7f6 /indra/cmake/Variables.cmake | |
| parent | c1e3f778cb377999edf49764088f3f23a2302afc (diff) | |
| parent | 6c422a881499c0d7649a59db47905a584bbd2bc1 (diff) | |
merge, close develop branch
--HG--
branch : develop
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) |