From d918701d585873fdeb1dd2e112831bf510e40b22 Mon Sep 17 00:00:00 2001
From: "Boroondas Gupte (original fix by Techwolf Lupindo)"
<hg@boroon.dasgupta.ch>
Date: Mon, 4 Oct 2010 23:54:31 +0200
Subject: SNOW-654: Added missing "if (LL_TESTS)" in indra/CMakeLists.txt
Daggified version of http://svn.secondlife.com/trac/linden/changeset/3431
(or of the SNOW-654 part of https://bitbucket.org/Techwolf/viewer-development/changeset/5697874b390b )
---
doc/contributions.txt | 2 ++
indra/CMakeLists.txt | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index a4647f005d..54960b515b 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -560,6 +560,8 @@ TBBle Kurosawa
VWR-1892
Teardrops Fall
VWR-5366
+Techwolf Lupindo
+ SNOW-654
tenebrous pau
VWR-247
Tharax Ferraris
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 1010b199a1..8052f7b473 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -112,6 +112,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)
--
cgit v1.2.3
From de9ec21470fae69a4e8eff9c204402de7a030cb8 Mon Sep 17 00:00:00 2001
From: Boroondas Gupte <hg@boroon.dasgupta.ch>
Date: Tue, 5 Oct 2010 00:01:16 +0200
Subject: SNOW-654 (follow up): adjusted comment line length after indentation
has changed
---
indra/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 8052f7b473..56333d6f30 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -113,7 +113,7 @@ if (SERVER)
endif (SERVER)
if (LL_TESTS)
- # Define after the custom viewer and server targets are created so individual
- # apps can add themselves as dependencies
+ # 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)
--
cgit v1.2.3