From 3e80fa3dbc943de9b784fedc202ba38cf238f46d Mon Sep 17 00:00:00 2001 From: David Parks Date: Mon, 2 Nov 2009 19:55:37 +0000 Subject: Sync up with render-pipeline-7 ignore-dead-branch --- indra/cmake/00-Common.cmake | 5 +++-- indra/cmake/LLPrimitive.cmake | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 173e650961..3bd10ea9ee 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -49,11 +49,12 @@ if (WINDOWS) add_definitions( /DLL_WINDOWS=1 + /DDOM_DYNAMIC /DUNICODE /D_UNICODE /GS /TP - /W3 + /W2 /c /Zc:forScope /nologo @@ -195,7 +196,7 @@ endif (DARWIN) if (LINUX OR DARWIN) - set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-non-virtual-dtor -Woverloaded-virtual") + set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-non-virtual-dtor") if (NOT GCC_DISABLE_FATAL_WARNINGS) set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake index d397b78f1c..9f8d99a0bf 100644 --- a/indra/cmake/LLPrimitive.cmake +++ b/indra/cmake/LLPrimitive.cmake @@ -1,7 +1,27 @@ # -*- cmake -*- +# these should be moved to their own cmake file +include(Prebuilt) +use_prebuilt_binary(colladadom) +use_prebuilt_binary(pcre) +use_prebuilt_binary(libxml) + set(LLPRIMITIVE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llprimitive ) -set(LLPRIMITIVE_LIBRARIES llprimitive) +if (WINDOWS) + set(LLPRIMITIVE_LIBRARIES + llprimitive + libcollada14dom21 + ) +else (WINDOWS) + set(LLPRIMITIVE_LIBRARIES + llprimitive + collada14dom + xml2 + pcrecpp + pcre + ) +endif (WINDOWS) + -- cgit v1.2.3 From c3bb2669ce30681449f7fe68f0822878565c273f Mon Sep 17 00:00:00 2001 From: "palmer@sansome-guest-196.lindenlab.com" Date: Tue, 3 Nov 2009 17:43:47 -0800 Subject: fix to make build run on mac --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index e7afe0ecba..5c0e639947 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -208,7 +208,7 @@ if (LINUX OR DARWIN) set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") endif (NOT GCC_DISABLE_FATAL_WARNINGS) - set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") + set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor") set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") -- cgit v1.2.3 From c504c40a754a79baf0e4b1d1c10ca44197d577df Mon Sep 17 00:00:00 2001 From: Palmer Date: Fri, 29 Jan 2010 15:04:14 -0800 Subject: Added glod.txt and libraries no longer unzipped into newview --- indra/cmake/Copy3rdPartyLibs.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index faf9da8b14..9a54c7a2e8 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -38,6 +38,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libcollada14dom21.dll + glod.dll ) # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables @@ -48,6 +50,8 @@ if(WINDOWS) libapr-1.dll libaprutil-1.dll libapriconv-1.dll + libcollada14dom21.dll + glod.dll ) if(USE_GOOGLE_PERFTOOLS) -- cgit v1.2.3 From f5f20a7851ddfa5f2b5d24c5a392acf9c0a745b5 Mon Sep 17 00:00:00 2001 From: Palmer Date: Fri, 29 Jan 2010 15:06:55 -0800 Subject: got rid of tab --- indra/cmake/Copy3rdPartyLibs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9a54c7a2e8..c9dc301b8b 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -19,7 +19,7 @@ if(WINDOWS) set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32") set(vivox_files SLVoice.exe - libsndfile-1.dll + libsndfile-1.dll vivoxplatform.dll vivoxsdk.dll ortp.dll -- cgit v1.2.3 From bc7f2e41fd268895774f9ddffd45be318662dcaa Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 8 Feb 2010 20:03:02 -0600 Subject: Switching to 10.5 SDK --- 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 db0b44eb8f..9b1f7024bf 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -79,7 +79,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # NOTE: wont have a distributable build unless you add this on the configure line with: # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' #set(CMAKE_OSX_ARCHITECTURES i386;ppc) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") set(ARCH universal) else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") -- cgit v1.2.3 From 0d65b34649bcbd2201f7c85949328a2e6423ae6b Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 8 Feb 2010 20:03:02 -0600 Subject: Switching to 10.5 SDK --- indra/cmake/Variables.cmake | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index bfaf3f4f26..9b1f7024bf 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -75,33 +75,11 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - - # NOTE: If specifying a different SDK with CMAKE_OSX_SYSROOT at configure - # time you should also specify CMAKE_OSX_DEPLOYMENT_TARGET explicitly, - # otherwise CMAKE_OSX_SYSROOT will be overridden here. We can't just check - # for it being unset, as it gets set to the system default :( - - # Default to building against the 10.4 SDK if no deployment target is - # specified. - if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html - # see http://public.kitware.com/Bug/view.php?id=9959 + poppy - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) - endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - - # GCC 4.2 is incompatible with the MacOSX 10.4 SDK - if (${CMAKE_OSX_SYSROOT} MATCHES "10.4u") - set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "4.0") - endif (${CMAKE_OSX_SYSROOT} MATCHES "10.4u") - - # NOTE: To attempt an i386/PPC Universal build, add this on the configure line: + # set this dynamically from the build system now - + # NOTE: wont have a distributable build unless you add this on the configure line with: # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' - # Build only for i386 by default, system default on MacOSX 10.6 is x86_64 - if (NOT CMAKE_OSX_ARCHITECTURES) - set(CMAKE_OSX_ARCHITECTURES i386) - endif (NOT CMAKE_OSX_ARCHITECTURES) - + #set(CMAKE_OSX_ARCHITECTURES i386;ppc) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") set(ARCH universal) else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") @@ -111,7 +89,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(ARCH i386) endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc") endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") - set(LL_ARCH ${ARCH}_darwin) set(LL_ARCH_DIR universal-darwin) set(WORD_SIZE 32) -- cgit v1.2.3 From de88d6ced487fd55fa6f6bb860849979f031a363 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 17 Feb 2010 11:29:16 -0600 Subject: Switched program database on windows to edit and continue for non-release builds. Adding a debug watch to LLCurlRequest to avoid invalidating iterator on processing posts. Mesh bulk uploading rewrite work in progress. 404 icons for mesh assets. --- indra/cmake/00-Common.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 49a1ec7f2c..2219311fc7 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -35,13 +35,13 @@ if (WINDOWS) # Don't build DLLs. set(BUILD_SHARED_LIBS OFF) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP" + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /ZI /MDd /MP" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP" + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /ZI /MD /MP" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP" + "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /MD /MP" CACHE STRING "C++ compiler release options" FORCE) set(CMAKE_CXX_STANDARD_LIBRARIES "") -- cgit v1.2.3 From 74621ff8a8a141d50a3c92430afbe53a9e00edb5 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 17 Feb 2010 15:50:50 -0600 Subject: Post-review cleanup. --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2219311fc7..113e21a715 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -41,7 +41,7 @@ if (WINDOWS) "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /ZI /MD /MP" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE - "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /MD /MP" + "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP" CACHE STRING "C++ compiler release options" FORCE) set(CMAKE_CXX_STANDARD_LIBRARIES "") -- cgit v1.2.3 From d6acc0f0c69195c2ac51d12145a180a42f8c69bb Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 23 Apr 2010 17:40:10 +0100 Subject: Backed out changeset 211aeed4e8f4 backing out "Switching to 10.5 SDK" --- 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 9b1f7024bf..db0b44eb8f 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -79,7 +79,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # NOTE: wont have a distributable build unless you add this on the configure line with: # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc' #set(CMAKE_OSX_ARCHITECTURES i386;ppc) - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") set(ARCH universal) else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc") -- cgit v1.2.3 From 809b6879e1d89ff3bc565f3144e4cb625ccdd185 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 26 Apr 2010 17:35:52 -0500 Subject: Use 10.5 sdk --- indra/cmake/Variables.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index bfaf3f4f26..f181e5b6fd 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -81,13 +81,13 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # otherwise CMAKE_OSX_SYSROOT will be overridden here. We can't just check # for it being unset, as it gets set to the system default :( - # Default to building against the 10.4 SDK if no deployment target is + # Default to building against the 10.5 SDK if no deployment target is # specified. if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html # see http://public.kitware.com/Bug/view.php?id=9959 + poppy - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET) # GCC 4.2 is incompatible with the MacOSX 10.4 SDK -- cgit v1.2.3 From 45396901731dc7ecb8ade9e585a43e811f4e4f05 Mon Sep 17 00:00:00 2001 From: "Karl Stiefvater (qarl)" Date: Fri, 7 May 2010 17:43:12 -0500 Subject: revert mac build to 10.4u sdk. remove FBO code from llrendertarget.cpp with #ifdefs. --- indra/cmake/Variables.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index f181e5b6fd..6b9fcbf509 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -81,13 +81,13 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # otherwise CMAKE_OSX_SYSROOT will be overridden here. We can't just check # for it being unset, as it gets set to the system default :( - # Default to building against the 10.5 SDK if no deployment target is + # Default to building against the 10.4u SDK if no deployment target is # specified. if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html # see http://public.kitware.com/Bug/view.php?id=9959 + poppy - set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) + set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4u) endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET) # GCC 4.2 is incompatible with the MacOSX 10.4 SDK -- cgit v1.2.3 From 761b346e8d6fcb9c052b5cfabc9a6be43b5775fe Mon Sep 17 00:00:00 2001 From: Palmer Truelson Date: Fri, 7 May 2010 16:32:29 -0700 Subject: Turning off universal builds --- indra/cmake/00-Common.cmake | 2 +- indra/cmake/Variables.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 113e21a715..ef83f43635 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -208,7 +208,7 @@ if (LINUX OR DARWIN) set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") endif (NOT GCC_DISABLE_FATAL_WARNINGS) - set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor") + set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 6b9fcbf509..28feb523ea 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -87,7 +87,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # NOTE: setting -isysroot is NOT adequate: http://lists.apple.com/archives/Xcode-users/2007/Oct/msg00696.html # see http://public.kitware.com/Bug/view.php?id=9959 + poppy set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.4u.sdk) - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4u) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.4) endif (NOT CMAKE_OSX_DEPLOYMENT_TARGET) # GCC 4.2 is incompatible with the MacOSX 10.4 SDK -- cgit v1.2.3 From f6c03a46731ad0af301ae2c8505050d9e514a7d4 Mon Sep 17 00:00:00 2001 From: "Karl Stiefvater (qarl)" Date: Mon, 10 May 2010 13:01:18 -0500 Subject: turn off -Woverloaded-virtual - incompatible with colladadom --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index ef83f43635..113e21a715 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -208,7 +208,7 @@ if (LINUX OR DARWIN) set(GCC_WARNINGS "${GCC_WARNINGS} -Werror") endif (NOT GCC_DISABLE_FATAL_WARNINGS) - set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual") + set(GCC_CXX_WARNINGS "${GCC_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor") set(CMAKE_C_FLAGS "${GCC_WARNINGS} ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "${GCC_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}") -- cgit v1.2.3 From cd13bc0e044d5014a0d7e131ae9d47924e376997 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 21 May 2010 11:52:00 +0100 Subject: if we're serious about the SSE thing then we should add these compiler flags for linux. though it's not quite enough, still. --- indra/cmake/00-Common.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 113e21a715..2cc8fa5e5f 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -169,6 +169,7 @@ 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 (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) -- cgit v1.2.3 From 7f5cc148bf0c2b8c77205ae5cb6db9841c0654d9 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 25 May 2010 14:00:59 +0100 Subject: Autovectorization crashes GCC 3.1. It's not very helpful anyway. Turn it off. --- indra/cmake/00-Common.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2cc8fa5e5f..802db82091 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -169,7 +169,8 @@ 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) + add_definitions(-march=pentium3 -mfpmath=sse) + #add_definitions(-ftree-vectorize) # THIS CRASHES GCC 3.1-3.2 if (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) -- cgit v1.2.3 From 673eef187777f4283aa2f90027f1b2ee3dadebe0 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 27 May 2010 15:14:20 +0100 Subject: we now require SSE_2_ so bump up the architecture for gcc. --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 802db82091..25cc05332b 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -169,7 +169,7 @@ 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) + add_definitions(-march=pentium4 -mfpmath=sse) #add_definitions(-ftree-vectorize) # THIS CRASHES GCC 3.1-3.2 if (NOT STANDALONE) # this stops us requiring a really recent glibc at runtime -- cgit v1.2.3 From 6e37ec08f678451a526f34218cb070d117cdf60a Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 14 Jun 2010 23:13:10 -0500 Subject: Builds with LLConvexDecompInter as a static lib. --- indra/cmake/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 4fc25dcc24..8612c46376 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -34,6 +34,7 @@ set(cmake_SOURCE_FILES FindXmlRpcEpi.cmake FMOD.cmake FreeType.cmake + GLOD.cmake GStreamer010Plugin.cmake GooglePerfTools.cmake JPEG.cmake @@ -41,6 +42,7 @@ set(cmake_SOURCE_FILES LLAudio.cmake LLCharacter.cmake LLCommon.cmake + LLConvexDecompInter.cmake LLCrashLogger.cmake LLDatabase.cmake LLImage.cmake -- cgit v1.2.3 From 3827b395fbca941846dab494ee8449786a39561d Mon Sep 17 00:00:00 2001 From: "Matthew Breindel (Falcon)" Date: Thu, 24 Jun 2010 16:45:47 -0700 Subject: Fixed cmake to grab the decomposition libraries. --- indra/cmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt index 8612c46376..cadd2608e2 100644 --- a/indra/cmake/CMakeLists.txt +++ b/indra/cmake/CMakeLists.txt @@ -42,7 +42,7 @@ set(cmake_SOURCE_FILES LLAudio.cmake LLCharacter.cmake LLCommon.cmake - LLConvexDecompInter.cmake + LLConvexDecomposition.cmake LLCrashLogger.cmake LLDatabase.cmake LLImage.cmake -- cgit v1.2.3 From b54fd9d6855c8547ce03beacf1ef04eb6396e75e Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 29 Jun 2010 13:04:31 +0100 Subject: VWR-8885 CMAKE build hard depends on artwork files Warn earlier, clearer and harder about missing artwork bundle - this still bites snowglobe builders regularly. Reviewed by Aimee. --- indra/cmake/ViewerMiscLibs.cmake | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/cmake') diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 2a8abdac23..32c4bc81df 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -7,3 +7,10 @@ if (NOT STANDALONE) use_prebuilt_binary(fontconfig) endif(NOT STANDALONE) +if(VIEWER AND NOT STANDALONE) + if(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker) + message(STATUS "We seem to have an artwork bundle in the tree - brilliant.") + else(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker) + message(FATAL_ERROR "Didn't find an artwork bundle - this needs to be downloaded separately and unpacked into this tree. You can probably get it from the same place you got your viewer source. Thanks!") + endif(EXISTS ${CMAKE_SOURCE_DIR}/newview/res/have_artwork_bundle.marker) +endif(VIEWER AND NOT STANDALONE) -- cgit v1.2.3 From 2fea1d5d33ec1b41a3cfa4307a1bfa58d8014f88 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 19 Aug 2010 12:25:15 -0500 Subject: Integrate SIMD API from oreh/server-trunk-oreh --- indra/cmake/00-Common.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 2c7bb77758..f10a61e1e7 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -68,6 +68,7 @@ if (WINDOWS) add_definitions( /Zc:wchar_t- + /arch:SSE2 ) endif (MSVC80 OR MSVC90) -- cgit v1.2.3 From 45df2d70f018512055ed15fa52c9efd3d8e833e8 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 19 Aug 2010 13:08:57 -0500 Subject: More line endings. --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index f10a61e1e7..8262462ced 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -68,7 +68,7 @@ if (WINDOWS) add_definitions( /Zc:wchar_t- - /arch:SSE2 + /arch:SSE2 ) endif (MSVC80 OR MSVC90) -- cgit v1.2.3 From 71de5f622a7917f78823a7e7840194e1b0f8f070 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 26 Aug 2010 14:23:12 -0500 Subject: Add missing files from viewer-experimental --- indra/cmake/GLOD.cmake | 9 +++++++++ indra/cmake/LLConvexDecomposition.cmake | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 indra/cmake/GLOD.cmake create mode 100644 indra/cmake/LLConvexDecomposition.cmake (limited to 'indra/cmake') diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake new file mode 100644 index 0000000000..77221d55ed --- /dev/null +++ b/indra/cmake/GLOD.cmake @@ -0,0 +1,9 @@ +# -*- cmake -*- +include(Prebuilt) + +if (NOT STANDALONE) + use_prebuilt_binary(GLOD) +endif (NOT STANDALONE) + +set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include) +set(GLOD_LIBRARIES glod) diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake new file mode 100644 index 0000000000..ae9dc3c17a --- /dev/null +++ b/indra/cmake/LLConvexDecomposition.cmake @@ -0,0 +1,16 @@ +# -*- cmake -*- +include(Prebuilt) + +set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + +if (INSTALL_PROPRIETARY AND NOT STANDALONE) + use_prebuilt_binary(llconvexdecomposition) + if (WINDOWS) + set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) + else (WINDOWS) + set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) + endif (WINDOWS) +else (INSTALL_PROPRIETARY AND NOT STANDALONE) + use_prebuilt_binary(llconvexdecompositionstub) + set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) +endif (INSTALL_PROPRIETARY AND NOT STANDALONE) -- cgit v1.2.3 From 054e8fbde325c03bc8f9a7c10aa8bb9319d501ba Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 26 Aug 2010 16:52:32 -0400 Subject: buildfix: fixing linux build to handle new SSE2 architecture code reviewed by davep and falcon --- indra/cmake/00-Common.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 8262462ced..20573c9495 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -144,6 +144,8 @@ if (LINUX) -fno-strict-aliasing -fsigned-char -g + -msse2 + -mfpmath=sse -pthread ) @@ -163,10 +165,6 @@ if (LINUX) link_directories(/usr/lib/mysql4/mysql) endif (EXISTS /usr/lib/mysql4/mysql) - add_definitions( - -msse2 - -mfpmath=sse - ) endif (SERVER) if (VIEWER) -- cgit v1.2.3 From e763cb13b7e901eba0d5a8d6671222c31f6fd632 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 26 Aug 2010 18:35:42 -0500 Subject: Disable edit-and-continue (makes breakpoints not work on occasion). --- indra/cmake/00-Common.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 8262462ced..d13fbb14d9 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -35,10 +35,10 @@ if (WINDOWS) # Don't build DLLs. set(BUILD_SHARED_LIBS OFF) - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /ZI /MDd /MP" + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /ZI /MD /MP" + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP" -- cgit v1.2.3 From 13180604e5752b8b5a98e049bc55028d68e71147 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Wed, 8 Sep 2010 11:30:50 -0400 Subject: SNOW-606 FIX disable packaging of libuuid Patch taken from JIRA, committing locally to fix our project branch. Code reviewed by Nyx / Brad --- indra/cmake/APR.cmake | 2 +- indra/cmake/Copy3rdPartyLibs.cmake | 1 - indra/cmake/ViewerMiscLibs.cmake | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index 180504d286..b6f1e06edd 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -56,7 +56,7 @@ else (STANDALONE) if (LINUX) if (VIEWER) - list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid) + list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES}) endif (VIEWER) list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt) endif (LINUX) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9900a8fb45..428b151c11 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -236,7 +236,6 @@ elseif(LINUX) libssl.so libstacktrace.so libtcmalloc.so - libuuid.so.1 libssl.so.0.9.7 ) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 32c4bc81df..5710360de2 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -2,7 +2,6 @@ include(Prebuilt) if (NOT STANDALONE) - use_prebuilt_binary(libuuid) use_prebuilt_binary(vivox) use_prebuilt_binary(fontconfig) endif(NOT STANDALONE) -- cgit v1.2.3 From 5213c90637390af255ede8e71ea0b87cdf35b27d Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 9 Sep 2010 16:57:05 -0500 Subject: Enable minimal rebuild and incremental linking for RelWithDebInfo builds. --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 893e485d1a..beb4f181b5 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -38,7 +38,7 @@ if (WINDOWS) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP" + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Gm /INCREMENTAL" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP" -- cgit v1.2.3 From b04d761a9c64da5a9fadd6accba1d91dcdbc2dd5 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 14 Sep 2010 11:11:18 -0400 Subject: CTS-231 WIP update mac and linux autobuild libraries for glod and convex decomp Updating cmake to ensure that linux uses the non-stub version of convex decomp. Code reviewed by Falcon --- indra/cmake/LLConvexDecomposition.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake index ae9dc3c17a..f310a493fd 100644 --- a/indra/cmake/LLConvexDecomposition.cmake +++ b/indra/cmake/LLConvexDecomposition.cmake @@ -5,11 +5,11 @@ set(LLCONVEXDECOMP_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (INSTALL_PROPRIETARY AND NOT STANDALONE) use_prebuilt_binary(llconvexdecomposition) - if (WINDOWS) + if (WINDOWS OR LINUX) set(LLCONVEXDECOMP_LIBRARY llconvexdecomposition) - else (WINDOWS) + else (WINDOWS OR LINUX) set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) - endif (WINDOWS) + endif (WINDOWS OR LINUX) else (INSTALL_PROPRIETARY AND NOT STANDALONE) use_prebuilt_binary(llconvexdecompositionstub) set(LLCONVEXDECOMP_LIBRARY llconvexdecompositionstub) -- cgit v1.2.3 From bee60281847e0d073554b0cd31a080ecad3aa5d1 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 16 Sep 2010 14:54:23 -0400 Subject: SNOW-606 REVERT libuuid removal backing out patch from SNOW-606 as it breaks the build on our linux build machines. Can be re-applied when our build machines get an updated version of libuuid. --- indra/cmake/APR.cmake | 2 +- indra/cmake/Copy3rdPartyLibs.cmake | 1 + indra/cmake/ViewerMiscLibs.cmake | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake index b6f1e06edd..180504d286 100644 --- a/indra/cmake/APR.cmake +++ b/indra/cmake/APR.cmake @@ -56,7 +56,7 @@ else (STANDALONE) if (LINUX) if (VIEWER) - list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES}) + list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} uuid) endif (VIEWER) list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES} rt) endif (LINUX) diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 428b151c11..9900a8fb45 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -236,6 +236,7 @@ elseif(LINUX) libssl.so libstacktrace.so libtcmalloc.so + libuuid.so.1 libssl.so.0.9.7 ) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 5710360de2..32c4bc81df 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -2,6 +2,7 @@ include(Prebuilt) if (NOT STANDALONE) + use_prebuilt_binary(libuuid) use_prebuilt_binary(vivox) use_prebuilt_binary(fontconfig) endif(NOT STANDALONE) -- cgit v1.2.3 From e18e26e87c46806f75d219b21be8b6ff2228fc99 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Sun, 19 Sep 2010 23:07:56 -0500 Subject: Use tcmalloc for windows (gives auto-magical 16-byte alignment whenever needed, much faster than Visual C++ malloc). --- indra/cmake/00-Common.cmake | 2 +- indra/cmake/GooglePerfTools.cmake | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index beb4f181b5..8b0864a539 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -38,7 +38,7 @@ if (WINDOWS) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP" CACHE STRING "C++ compiler debug options" FORCE) set(CMAKE_CXX_FLAGS_RELWITHDEBINFO - "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Gm /INCREMENTAL" + "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Gm" CACHE STRING "C++ compiler release-with-debug options" FORCE) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP" diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 946fc6b375..ee231dcde6 100644 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -6,7 +6,7 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(google) if (WINDOWS) - use_prebuilt_binary(google-perftools) + use_prebuilt_binary(tcmalloc) set(TCMALLOC_LIBRARIES debug libtcmalloc_minimal-debug optimized libtcmalloc_minimal) @@ -29,8 +29,7 @@ if (GOOGLE_PERFTOOLS_FOUND) endif (GOOGLE_PERFTOOLS_FOUND) if (WINDOWS) - # *TODO -reenable this once we get server usage sorted out - #set(USE_GOOGLE_PERFTOOLS ON) + set(USE_GOOGLE_PERFTOOLS ON) endif (WINDOWS) if (USE_GOOGLE_PERFTOOLS) -- cgit v1.2.3 From 90e3d83a5cb35e98a02a3017dd79ebc272bbfe85 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Tue, 21 Sep 2010 13:26:52 -0400 Subject: Fix for build failures - disabling tcmalloc for now --- indra/cmake/00-Common.cmake | 0 indra/cmake/APR.cmake | 0 indra/cmake/Audio.cmake | 0 indra/cmake/BerkeleyDB.cmake | 0 indra/cmake/Boost.cmake | 0 indra/cmake/BuildVersion.cmake | 0 indra/cmake/CARes.cmake | 0 indra/cmake/CMakeCopyIfDifferent.cmake | 0 indra/cmake/CMakeLists.txt | 0 indra/cmake/CSharpMacros.cmake | 0 indra/cmake/CURL.cmake | 0 indra/cmake/Copy3rdPartyLibs.cmake | 0 indra/cmake/CopyBackToSource.cmake | 0 indra/cmake/DBusGlib.cmake | 0 indra/cmake/DeploySharedLibs.cmake | 0 indra/cmake/DirectX.cmake | 0 indra/cmake/DragDrop.cmake | 0 indra/cmake/ELFIO.cmake | 0 indra/cmake/EXPAT.cmake | 0 indra/cmake/ExamplePlugin.cmake | 0 indra/cmake/Externals.cmake | 0 indra/cmake/FMOD.cmake | 0 indra/cmake/FindAPR.cmake | 0 indra/cmake/FindBerkeleyDB.cmake | 0 indra/cmake/FindCARes.cmake | 0 indra/cmake/FindELFIO.cmake | 0 indra/cmake/FindGooglePerfTools.cmake | 0 indra/cmake/FindMT.cmake | 0 indra/cmake/FindMono.cmake | 0 indra/cmake/FindMySQL.cmake | 0 indra/cmake/FindOpenJPEG.cmake | 0 indra/cmake/FindSCP.cmake | 0 indra/cmake/FindSVN.cmake | 0 indra/cmake/FindXmlRpcEpi.cmake | 0 indra/cmake/FreeType.cmake | 0 indra/cmake/GLOD.cmake | 0 indra/cmake/GStreamer010Plugin.cmake | 0 indra/cmake/GetPrerequisites_2_8.cmake | 0 indra/cmake/Glui.cmake | 0 indra/cmake/Glut.cmake | 0 indra/cmake/GoogleBreakpad.cmake | 0 indra/cmake/GoogleMock.cmake | 0 indra/cmake/GooglePerfTools.cmake | 2 +- indra/cmake/JPEG.cmake | 0 indra/cmake/LLAddBuildTest.cmake | 0 indra/cmake/LLAudio.cmake | 0 indra/cmake/LLCharacter.cmake | 0 indra/cmake/LLCommon.cmake | 0 indra/cmake/LLConvexDecomposition.cmake | 0 indra/cmake/LLCrashLogger.cmake | 0 indra/cmake/LLDatabase.cmake | 0 indra/cmake/LLImage.cmake | 0 indra/cmake/LLImageJ2COJ.cmake | 0 indra/cmake/LLInventory.cmake | 0 indra/cmake/LLKDU.cmake | 0 indra/cmake/LLLogin.cmake | 0 indra/cmake/LLMath.cmake | 0 indra/cmake/LLMessage.cmake | 0 indra/cmake/LLPlugin.cmake | 0 indra/cmake/LLPrimitive.cmake | 0 indra/cmake/LLRender.cmake | 0 indra/cmake/LLScene.cmake | 0 indra/cmake/LLSharedLibs.cmake | 0 indra/cmake/LLTestCommand.cmake | 0 indra/cmake/LLUI.cmake | 0 indra/cmake/LLVFS.cmake | 0 indra/cmake/LLWindow.cmake | 0 indra/cmake/LLXML.cmake | 0 indra/cmake/LLXUIXML.cmake | 0 indra/cmake/LScript.cmake | 0 indra/cmake/Linking.cmake | 0 indra/cmake/MediaPluginBase.cmake | 0 indra/cmake/MonoDeps.cmake | 0 indra/cmake/MonoEmbed.cmake | 0 indra/cmake/MySQL.cmake | 0 indra/cmake/NDOF.cmake | 0 indra/cmake/OPENAL.cmake | 0 indra/cmake/OpenGL.cmake | 0 indra/cmake/OpenJPEG.cmake | 0 indra/cmake/OpenSSL.cmake | 0 indra/cmake/PNG.cmake | 0 indra/cmake/PluginAPI.cmake | 0 indra/cmake/Prebuilt.cmake | 0 indra/cmake/Pth.cmake | 0 indra/cmake/PulseAudio.cmake | 0 indra/cmake/Python.cmake | 0 indra/cmake/QuickTimePlugin.cmake | 0 indra/cmake/TemplateCheck.cmake | 0 indra/cmake/Tut.cmake | 0 indra/cmake/UI.cmake | 0 indra/cmake/UnixInstall.cmake | 0 indra/cmake/Variables.cmake | 0 indra/cmake/ViewerMiscLibs.cmake | 0 indra/cmake/WebKitLibPlugin.cmake | 0 indra/cmake/XmlRpcEpi.cmake | 0 indra/cmake/ZLIB.cmake | 0 indra/cmake/cmake_dummy.cpp | 0 indra/cmake/run_build_test.py | 0 98 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 indra/cmake/00-Common.cmake mode change 100644 => 100755 indra/cmake/APR.cmake mode change 100644 => 100755 indra/cmake/Audio.cmake mode change 100644 => 100755 indra/cmake/BerkeleyDB.cmake mode change 100644 => 100755 indra/cmake/Boost.cmake mode change 100644 => 100755 indra/cmake/BuildVersion.cmake mode change 100644 => 100755 indra/cmake/CARes.cmake mode change 100644 => 100755 indra/cmake/CMakeCopyIfDifferent.cmake mode change 100644 => 100755 indra/cmake/CMakeLists.txt mode change 100644 => 100755 indra/cmake/CSharpMacros.cmake mode change 100644 => 100755 indra/cmake/CURL.cmake mode change 100644 => 100755 indra/cmake/Copy3rdPartyLibs.cmake mode change 100644 => 100755 indra/cmake/CopyBackToSource.cmake mode change 100644 => 100755 indra/cmake/DBusGlib.cmake mode change 100644 => 100755 indra/cmake/DeploySharedLibs.cmake mode change 100644 => 100755 indra/cmake/DirectX.cmake mode change 100644 => 100755 indra/cmake/DragDrop.cmake mode change 100644 => 100755 indra/cmake/ELFIO.cmake mode change 100644 => 100755 indra/cmake/EXPAT.cmake mode change 100644 => 100755 indra/cmake/ExamplePlugin.cmake mode change 100644 => 100755 indra/cmake/Externals.cmake mode change 100644 => 100755 indra/cmake/FMOD.cmake mode change 100644 => 100755 indra/cmake/FindAPR.cmake mode change 100644 => 100755 indra/cmake/FindBerkeleyDB.cmake mode change 100644 => 100755 indra/cmake/FindCARes.cmake mode change 100644 => 100755 indra/cmake/FindELFIO.cmake mode change 100644 => 100755 indra/cmake/FindGooglePerfTools.cmake mode change 100644 => 100755 indra/cmake/FindMT.cmake mode change 100644 => 100755 indra/cmake/FindMono.cmake mode change 100644 => 100755 indra/cmake/FindMySQL.cmake mode change 100644 => 100755 indra/cmake/FindOpenJPEG.cmake mode change 100644 => 100755 indra/cmake/FindSCP.cmake mode change 100644 => 100755 indra/cmake/FindSVN.cmake mode change 100644 => 100755 indra/cmake/FindXmlRpcEpi.cmake mode change 100644 => 100755 indra/cmake/FreeType.cmake mode change 100644 => 100755 indra/cmake/GLOD.cmake mode change 100644 => 100755 indra/cmake/GStreamer010Plugin.cmake mode change 100644 => 100755 indra/cmake/GetPrerequisites_2_8.cmake mode change 100644 => 100755 indra/cmake/Glui.cmake mode change 100644 => 100755 indra/cmake/Glut.cmake mode change 100644 => 100755 indra/cmake/GoogleBreakpad.cmake mode change 100644 => 100755 indra/cmake/GoogleMock.cmake mode change 100644 => 100755 indra/cmake/GooglePerfTools.cmake mode change 100644 => 100755 indra/cmake/JPEG.cmake mode change 100644 => 100755 indra/cmake/LLAddBuildTest.cmake mode change 100644 => 100755 indra/cmake/LLAudio.cmake mode change 100644 => 100755 indra/cmake/LLCharacter.cmake mode change 100644 => 100755 indra/cmake/LLCommon.cmake mode change 100644 => 100755 indra/cmake/LLConvexDecomposition.cmake mode change 100644 => 100755 indra/cmake/LLCrashLogger.cmake mode change 100644 => 100755 indra/cmake/LLDatabase.cmake mode change 100644 => 100755 indra/cmake/LLImage.cmake mode change 100644 => 100755 indra/cmake/LLImageJ2COJ.cmake mode change 100644 => 100755 indra/cmake/LLInventory.cmake mode change 100644 => 100755 indra/cmake/LLKDU.cmake mode change 100644 => 100755 indra/cmake/LLLogin.cmake mode change 100644 => 100755 indra/cmake/LLMath.cmake mode change 100644 => 100755 indra/cmake/LLMessage.cmake mode change 100644 => 100755 indra/cmake/LLPlugin.cmake mode change 100644 => 100755 indra/cmake/LLPrimitive.cmake mode change 100644 => 100755 indra/cmake/LLRender.cmake mode change 100644 => 100755 indra/cmake/LLScene.cmake mode change 100644 => 100755 indra/cmake/LLSharedLibs.cmake mode change 100644 => 100755 indra/cmake/LLTestCommand.cmake mode change 100644 => 100755 indra/cmake/LLUI.cmake mode change 100644 => 100755 indra/cmake/LLVFS.cmake mode change 100644 => 100755 indra/cmake/LLWindow.cmake mode change 100644 => 100755 indra/cmake/LLXML.cmake mode change 100644 => 100755 indra/cmake/LLXUIXML.cmake mode change 100644 => 100755 indra/cmake/LScript.cmake mode change 100644 => 100755 indra/cmake/Linking.cmake mode change 100644 => 100755 indra/cmake/MediaPluginBase.cmake mode change 100644 => 100755 indra/cmake/MonoDeps.cmake mode change 100644 => 100755 indra/cmake/MonoEmbed.cmake mode change 100644 => 100755 indra/cmake/MySQL.cmake mode change 100644 => 100755 indra/cmake/NDOF.cmake mode change 100644 => 100755 indra/cmake/OPENAL.cmake mode change 100644 => 100755 indra/cmake/OpenGL.cmake mode change 100644 => 100755 indra/cmake/OpenJPEG.cmake mode change 100644 => 100755 indra/cmake/OpenSSL.cmake mode change 100644 => 100755 indra/cmake/PNG.cmake mode change 100644 => 100755 indra/cmake/PluginAPI.cmake mode change 100644 => 100755 indra/cmake/Prebuilt.cmake mode change 100644 => 100755 indra/cmake/Pth.cmake mode change 100644 => 100755 indra/cmake/PulseAudio.cmake mode change 100644 => 100755 indra/cmake/Python.cmake mode change 100644 => 100755 indra/cmake/QuickTimePlugin.cmake mode change 100644 => 100755 indra/cmake/TemplateCheck.cmake mode change 100644 => 100755 indra/cmake/Tut.cmake mode change 100644 => 100755 indra/cmake/UI.cmake mode change 100644 => 100755 indra/cmake/UnixInstall.cmake mode change 100644 => 100755 indra/cmake/Variables.cmake mode change 100644 => 100755 indra/cmake/ViewerMiscLibs.cmake mode change 100644 => 100755 indra/cmake/WebKitLibPlugin.cmake mode change 100644 => 100755 indra/cmake/XmlRpcEpi.cmake mode change 100644 => 100755 indra/cmake/ZLIB.cmake mode change 100644 => 100755 indra/cmake/cmake_dummy.cpp mode change 100644 => 100755 indra/cmake/run_build_test.py (limited to 'indra/cmake') diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/CMakeCopyIfDifferent.cmake b/indra/cmake/CMakeCopyIfDifferent.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt old mode 100644 new mode 100755 diff --git a/indra/cmake/CSharpMacros.cmake b/indra/cmake/CSharpMacros.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/CopyBackToSource.cmake b/indra/cmake/CopyBackToSource.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/DBusGlib.cmake b/indra/cmake/DBusGlib.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/DeploySharedLibs.cmake b/indra/cmake/DeploySharedLibs.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/DirectX.cmake b/indra/cmake/DirectX.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/DragDrop.cmake b/indra/cmake/DragDrop.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/ELFIO.cmake b/indra/cmake/ELFIO.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/EXPAT.cmake b/indra/cmake/EXPAT.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/ExamplePlugin.cmake b/indra/cmake/ExamplePlugin.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Externals.cmake b/indra/cmake/Externals.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindAPR.cmake b/indra/cmake/FindAPR.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindBerkeleyDB.cmake b/indra/cmake/FindBerkeleyDB.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindCARes.cmake b/indra/cmake/FindCARes.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindELFIO.cmake b/indra/cmake/FindELFIO.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindGooglePerfTools.cmake b/indra/cmake/FindGooglePerfTools.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindMT.cmake b/indra/cmake/FindMT.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindMono.cmake b/indra/cmake/FindMono.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindMySQL.cmake b/indra/cmake/FindMySQL.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindOpenJPEG.cmake b/indra/cmake/FindOpenJPEG.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindSCP.cmake b/indra/cmake/FindSCP.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindSVN.cmake b/indra/cmake/FindSVN.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FindXmlRpcEpi.cmake b/indra/cmake/FindXmlRpcEpi.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/GLOD.cmake b/indra/cmake/GLOD.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/GStreamer010Plugin.cmake b/indra/cmake/GStreamer010Plugin.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/GetPrerequisites_2_8.cmake b/indra/cmake/GetPrerequisites_2_8.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Glui.cmake b/indra/cmake/Glui.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Glut.cmake b/indra/cmake/Glut.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/GoogleBreakpad.cmake b/indra/cmake/GoogleBreakpad.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/GoogleMock.cmake b/indra/cmake/GoogleMock.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake old mode 100644 new mode 100755 index ee231dcde6..dc6d013bf2 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -33,7 +33,7 @@ if (WINDOWS) endif (WINDOWS) if (USE_GOOGLE_PERFTOOLS) - set(TCMALLOC_FLAG -DLL_USE_TCMALLOC=1) + set(TCMALLOC_FLAG -ULL_USE_TCMALLOC=1) include_directories(${GOOGLE_PERFTOOLS_INCLUDE_DIR}) set(GOOGLE_PERFTOOLS_LIBRARIES ${TCMALLOC_LIBRARIES} ${STACKTRACE_LIBRARIES} ${PROFILER_LIBRARIES}) else (USE_GOOGLE_PERFTOOLS) diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLAudio.cmake b/indra/cmake/LLAudio.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLCharacter.cmake b/indra/cmake/LLCharacter.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLConvexDecomposition.cmake b/indra/cmake/LLConvexDecomposition.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLCrashLogger.cmake b/indra/cmake/LLCrashLogger.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLDatabase.cmake b/indra/cmake/LLDatabase.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLImage.cmake b/indra/cmake/LLImage.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLImageJ2COJ.cmake b/indra/cmake/LLImageJ2COJ.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLInventory.cmake b/indra/cmake/LLInventory.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLKDU.cmake b/indra/cmake/LLKDU.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLLogin.cmake b/indra/cmake/LLLogin.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLMath.cmake b/indra/cmake/LLMath.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLMessage.cmake b/indra/cmake/LLMessage.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLPlugin.cmake b/indra/cmake/LLPlugin.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLScene.cmake b/indra/cmake/LLScene.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLTestCommand.cmake b/indra/cmake/LLTestCommand.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLUI.cmake b/indra/cmake/LLUI.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLVFS.cmake b/indra/cmake/LLVFS.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLXML.cmake b/indra/cmake/LLXML.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LLXUIXML.cmake b/indra/cmake/LLXUIXML.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/LScript.cmake b/indra/cmake/LScript.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/MediaPluginBase.cmake b/indra/cmake/MediaPluginBase.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/MonoDeps.cmake b/indra/cmake/MonoDeps.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/MonoEmbed.cmake b/indra/cmake/MonoEmbed.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/MySQL.cmake b/indra/cmake/MySQL.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/PluginAPI.cmake b/indra/cmake/PluginAPI.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Pth.cmake b/indra/cmake/Pth.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/PulseAudio.cmake b/indra/cmake/PulseAudio.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/QuickTimePlugin.cmake b/indra/cmake/QuickTimePlugin.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/TemplateCheck.cmake b/indra/cmake/TemplateCheck.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Tut.cmake b/indra/cmake/Tut.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/ZLIB.cmake b/indra/cmake/ZLIB.cmake old mode 100644 new mode 100755 diff --git a/indra/cmake/cmake_dummy.cpp b/indra/cmake/cmake_dummy.cpp old mode 100644 new mode 100755 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 245842a765c8416fc0e0d5c38d0cb731ed7d5cbf Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Thu, 23 Sep 2010 11:25:40 -0400 Subject: SH-64 update GLOD on mac updated GLOD again to be searched for in the correct place and updated some cmake configuration to ensure that it is being referred to in the correct places. This appears to finally solve our mac startup crash. --- indra/cmake/Copy3rdPartyLibs.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9900a8fb45..76cb0553f3 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -169,7 +169,8 @@ elseif(DARWIN) libaprutil-1.dylib libexpat.0.5.0.dylib libexpat.dylib - libllqtwebkit.dylib + libGLOD.dylib + libllqtwebkit.dylib libndofdev.dylib libexception_handler.dylib ) -- cgit v1.2.3 From 7f9285979d744ee3591f810928e2ab570baba90e Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 23 Sep 2010 14:59:03 -0400 Subject: WIP make tcmalloc work on linux (JIRA pending) First pass at integrating the linux version of tcmalloc. Code will be reviewed in a later commit before pushing. --- indra/cmake/Copy3rdPartyLibs.cmake | 2 +- indra/cmake/GooglePerfTools.cmake | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 9900a8fb45..915f9c183f 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -235,7 +235,7 @@ elseif(LINUX) libopenjpeg.so libssl.so libstacktrace.so - libtcmalloc.so + libtcmalloc_minimal.so libuuid.so.1 libssl.so.0.9.7 ) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index dc6d013bf2..5581b3b0e3 100755 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -13,7 +13,10 @@ else (STANDALONE) set(GOOGLE_PERFTOOLS_FOUND "YES") endif (WINDOWS) if (LINUX) - set(TCMALLOC_LIBRARIES tcmalloc) + use_prebuilt_binary(tcmalloc) + set(TCMALLOC_LIBRARIES + debug libtcmalloc_minimal_debug + optimized libtcmalloc_minimal) set(STACKTRACE_LIBRARIES stacktrace) set(PROFILER_LIBRARIES profiler) set(GOOGLE_PERFTOOLS_INCLUDE_DIR -- cgit v1.2.3 From 1ac289bac95db85c90058ed333ff8cb261d93c6f Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 23 Sep 2010 16:46:02 -0400 Subject: SH-211 FIX update viewer-mesh branch to use new tcmalloc package Finished changes to make viewer-mesh make use of tcmalloc on linux. Almost all changes are juggling cmake config files, to make sure that the package is downloaded, installed, moved at the right times, and linked at the right times. Code reviewed by Seraph --- indra/cmake/Copy3rdPartyLibs.cmake | 1 + indra/cmake/GooglePerfTools.cmake | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/cmake') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 915f9c183f..923c0e160e 100755 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -236,6 +236,7 @@ elseif(LINUX) libssl.so libstacktrace.so libtcmalloc_minimal.so + libtcmalloc_minimal.so.0 libuuid.so.1 libssl.so.0.9.7 ) diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake index 5581b3b0e3..048f5a3235 100755 --- a/indra/cmake/GooglePerfTools.cmake +++ b/indra/cmake/GooglePerfTools.cmake @@ -15,8 +15,8 @@ else (STANDALONE) if (LINUX) use_prebuilt_binary(tcmalloc) set(TCMALLOC_LIBRARIES - debug libtcmalloc_minimal_debug - optimized libtcmalloc_minimal) + debug tcmalloc_minimal_debug + optimized tcmalloc_minimal) set(STACKTRACE_LIBRARIES stacktrace) set(PROFILER_LIBRARIES profiler) set(GOOGLE_PERFTOOLS_INCLUDE_DIR -- cgit v1.2.3