summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-12 10:15:29 +0200
committerBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-12 10:15:29 +0200
commit8b55caf9767777c2bfd578cba22f220b2c2c21be (patch)
tree848c871502f359a83eeb5271d54d5e9d67035cff
parent11996e9dd79e83a437f52af694ffdd525a490821 (diff)
parentde9ec21470fae69a4e8eff9c204402de7a030cb8 (diff)
merged SNOW-654: Added missing "if (LL_TESTS)" in indra/CMakeLists.txt
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/CMakeLists.txt8
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index f2678289ec..c9c79e9771 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -661,6 +661,7 @@ Techwolf Lupindo
SNOW-649
SNOW-650
SNOW-651
+ SNOW-654
SNOW-687
SNOW-680
SNOW-681
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 261c0b17e2..8d4969a49e 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -123,6 +123,8 @@ if (SERVER)
endif (WINDOWS)
endif (SERVER)
-# Define after the custom viewer and server targets are created so individual
-# apps can add themselves as dependencies
-add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests)
+if (LL_TESTS)
+ # Define after the custom viewer and server targets are created so
+ # individual apps can add themselves as dependencies
+ add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests)
+endif (LL_TESTS)