summaryrefslogtreecommitdiff
path: root/indra/cmake/Variables.cmake
diff options
context:
space:
mode:
authorBjoseph Wombat <bjoseph@vivox.com>2015-10-06 22:39:07 +0100
committerBjoseph Wombat <bjoseph@vivox.com>2015-10-06 22:39:07 +0100
commit9c4202f2f837601b76d1e04045a1914e1c974981 (patch)
tree30eadf8bd2fa12537d15a7b8eedca17321f767c9 /indra/cmake/Variables.cmake
parent8aedbbda159344ed1af042e562c34ae5759a3b0d (diff)
parent17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff)
merged changes from viewer-xcode-7
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 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)