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 e9b454f5f938251697e582152ddfeefae5070c87 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 4 May 2011 10:49:45 -0400 Subject: Slightly improve sanity of run_build_test.py output. Flushing print buffer before running actual test executable should make it clearer which setup actions apply to which test run. --- indra/cmake/run_build_test.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py index 320a9be8ab..ce2d1e0386 100755 --- a/indra/cmake/run_build_test.py +++ b/indra/cmake/run_build_test.py @@ -109,6 +109,8 @@ def main(command, libpath=[], vars={}): os.environ.update(dict([(str(key), str(value)) for key, value in vars.iteritems()])) # Run the child process. print "Running: %s" % " ".join(command) + # Make sure we see all relevant output *before* child-process output. + sys.stdout.flush() return subprocess.call(command) if __name__ == "__main__": -- 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 From 0488142b93b6a5cc804a98e28e5dedc28cd4ea54 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Tue, 21 Jun 2011 00:09:17 +0200 Subject: OPEN-99: use -march=pentium3 for 32-bit builds only --- indra/cmake/00-Common.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2cc8fa5e5f..d9e1dd9afb 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -169,7 +169,10 @@ if (LINUX) add_definitions(-fvisibility=hidden) # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. add_definitions(-DLL_IGNORE_SIGCHLD) - add_definitions(-march=pentium3 -mfpmath=sse -ftree-vectorize) + if (WORD_SIZE EQUAL 32) + add_definitions(-march=pentium3) + endif (WORD_SIZE EQUAL 32) + add_definitions(-mfpmath=sse -ftree-vectorize) if (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) -- cgit v1.2.3