From 411a1bfcb6e6f7c0bc6e8afcf8aed447426df340 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Fri, 15 Apr 2011 20:08:06 +0000 Subject: Set run_build_test.py to be executable --- indra/cmake/run_build_test.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 indra/cmake/run_build_test.py (limited to 'indra/cmake') diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py old mode 100644 new mode 100755 -- cgit v1.2.3 From 7e998f5eccdbcff35a4807b92d6b8a9cb4735f14 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Tue, 19 Apr 2011 21:49:11 +0000 Subject: Fix for problems executing test build script --- indra/cmake/LLTestCommand.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/LLTestCommand.cmake b/indra/cmake/LLTestCommand.cmake index 554559edbd..7e9854dc4c 100644 --- a/indra/cmake/LLTestCommand.cmake +++ b/indra/cmake/LLTestCommand.cmake @@ -1,3 +1,5 @@ +include(Python) + MACRO(LL_TEST_COMMAND OUTVAR LD_LIBRARY_PATH) # nat wonders how Kitware can use the term 'function' for a construct that # cannot return a value. And yet, variables you set inside a FUNCTION are -- cgit v1.2.3 From b530648dd4c5fbf9e566401b4262865047de2e4a Mon Sep 17 00:00:00 2001 From: Leslie Linden Date: Wed, 1 Jun 2011 11:46:53 -0700 Subject: EXP-869 FIX -- Mac viewer should build without requiring settings modifications Modified cmake GCC_VERSION from 4.2 to 4.0, our officially supported GCC version Reviewed by Richard --- indra/cmake/Variables.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/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: -- cgit v1.2.3