--- linden/indra/llimage/CMakeLists.txt	2009-07-04 20:13:32.288644392 +0200
+++ linden/indra/llimage/CMakeLists.txt	2009-07-04 20:18:14.315281741 +0200
@@ -3,7 +3,11 @@
 project(llimage)
 
 include(00-Common)
-include(LLAddBuildTest)
+
+IF(CMAKE_BUILD_TYPE EQUAL "Debug")
+	include(LLAddBuildTest)
+ENDIF(CMAKE_BUILD_TYPE EQUAL "Debug")
+
 include(LLCommon)
 include(LLImage)
 include(LLMath)
@@ -60,4 +64,6 @@
     )
 
 # Add tests
-ADD_BUILD_TEST(llimageworker llimage)
+IF(CMAKE_BUILD_TYPE EQUAL "Debug")
+	ADD_BUILD_TEST(llimageworker llimage)
+ENDIF(CMAKE_BUILD_TYPE EQUAL "Debug")
--- linden/indra/llmessage/CMakeLists.txt	2009-07-04 20:28:52.435221376 +0200
+++ linden/indra/llmessage/CMakeLists.txt	2009-07-04 20:29:48.608549865 +0200
@@ -7,8 +7,11 @@
 include(LLMath)
 include(LLMessage)
 include(LLVFS)
-include(LLAddBuildTest)
-include(Tut)
+
+IF(CMAKE_BUILD_TYPE EQUAL "Debug")
+	include(LLAddBuildTest)
+	include(Tut)
+ENDIF(CMAKE_BUILD_TYPE EQUAL "Debug")
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 
--- linden/indra/newview/CMakeLists.txt	2009-07-04 20:31:43.498535328 +0200
+++ linden/indra/newview/CMakeLists.txt	2009-07-04 20:32:39.835192500 +0200
@@ -10,7 +10,11 @@
 include(FMOD)
 include(OPENAL)
 include(FindOpenGL)
-include(LLAddBuildTest)
+
+IF(CMAKE_BUILD_TYPE EQUAL "Debug")
+	include(LLAddBuildTest)
+ENDIF(CMAKE_BUILD_TYPE EQUAL "Debug")
+
 include(LLAudio)
 include(LLCharacter)
 include(LLCommon)
@@ -1589,9 +1593,11 @@
 endif (INSTALL)
 
 # Add tests
+IF(CMAKE_BUILD_TYPE EQUAL "Debug")
 ADD_VIEWER_BUILD_TEST(llagentaccess viewer)
 ADD_VIEWER_BUILD_TEST(llworldmap viewer)
 ADD_VIEWER_BUILD_TEST(llworldmipmap viewer)
 ADD_VIEWER_BUILD_TEST(lltextureinfo viewer)
 ADD_VIEWER_BUILD_TEST(lltextureinfodetails viewer)
+ENDIF(CMAKE_BUILD_TYPE EQUAL "Debug")