From 90e3d83a5cb35e98a02a3017dd79ebc272bbfe85 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 21 Sep 2010 13:26:52 -0400
Subject: Fix for build failures - disabling tcmalloc for now

---
 indra/llxml/CMakeLists.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/llxml/CMakeLists.txt

(limited to 'indra/llxml/CMakeLists.txt')

diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 295de1a5372cf70563a6f25313c17f26bd05b039 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 30 Sep 2010 15:56:41 -0500
Subject: Put some errant tests under if (LL_TESTS) conditional.

---
 indra/llxml/CMakeLists.txt | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

(limited to 'indra/llxml/CMakeLists.txt')

diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index fbcfade383..21cdf5f926 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -47,22 +47,23 @@ target_link_libraries( llxml
 
 # tests
 
-# unit tests
-
-SET(llxml_TEST_SOURCE_FILES
-  # none yet!
-  )
-LL_ADD_PROJECT_UNIT_TESTS(llxml "${llxml_TEST_SOURCE_FILES}")
-
-# integration tests
-
-#    set(TEST_DEBUG on)
-set(test_libs
-  ${LLXML_LIBRARIES}
-  ${WINDOWS_LIBRARIES}
-  ${LLMATH_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-  )
-
-LL_ADD_INTEGRATION_TEST(llcontrol "" "${test_libs}")
-
+if (LL_TESTS)
+	# unit tests
+
+	SET(llxml_TEST_SOURCE_FILES
+	  # none yet!
+	  )
+	LL_ADD_PROJECT_UNIT_TESTS(llxml "${llxml_TEST_SOURCE_FILES}")
+
+	# integration tests
+
+	#    set(TEST_DEBUG on)
+	set(test_libs
+	  ${LLXML_LIBRARIES}
+	  ${WINDOWS_LIBRARIES}
+	  ${LLMATH_LIBRARIES}
+	  ${LLCOMMON_LIBRARIES}
+	  )
+
+	LL_ADD_INTEGRATION_TEST(llcontrol "" "${test_libs}")
+endif (LL_TESTS)
-- 
cgit v1.2.3