summaryrefslogtreecommitdiff
path: root/indra/cmake/Variables.cmake
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-09-29 13:35:41 -0700
committercallum_linden <none@none>2015-09-29 13:35:41 -0700
commit6765d666374a293762fd9b2be09465649982b3cb (patch)
tree8ffa9d2b78ca4abf9c0dda539d648b243322d004 /indra/cmake/Variables.cmake
parent11c188dc734fd1dc921a2fa4c14e89a0e190c26b (diff)
parent17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff)
Merge with viewer-xcode-7 for Xcode 7 patches
Diffstat (limited to 'indra/cmake/Variables.cmake')
-rwxr-xr-xindra/cmake/Variables.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 47f123f3ab..63e296b556 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)