diff options
| author | prep linden <prep@lindenlab.com> | 2011-06-07 16:54:13 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-06-07 16:54:13 -0400 |
| commit | c4c8e13ac5f555a5b9257582bcc8c3494be1de5d (patch) | |
| tree | 897327da900fb002065b1e2f01f213333115d556 /indra/cmake | |
| parent | dbd619508ba45292c2cebe096494c28e74941643 (diff) | |
| parent | 017da5453e92170ba37e93f364f30a9ccfbff202 (diff) | |
merge
Diffstat (limited to 'indra/cmake')
| -rw-r--r--[-rwxr-xr-x] | indra/cmake/FMOD.cmake | 0 | ||||
| -rw-r--r-- | indra/cmake/Variables.cmake | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/cmake/run_build_test.py | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake index cb5124812d..cb5124812d 100755..100644 --- a/indra/cmake/FMOD.cmake +++ b/indra/cmake/FMOD.cmake diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index cfccd29def..4cbf7aa043 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -102,7 +102,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # To support a different SDK update these Xcode settings: set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.2") + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym) # NOTE: To attempt an i386/PPC Universal build, add this on the configure line: diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index ce2d1e0386..ce2d1e0386 100755..100644 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py |