From 27ec7841279865ecc48a7a0af2f4591ff0300afc Mon Sep 17 00:00:00 2001
From: Boroondas Gupte <hg@boroon.dasgupta.ch>
Date: Sun, 29 Aug 2010 16:43:08 +0200
Subject: [PATCH] VWR-20891 FIXED missing LL_TEST conditions in
indra/viewer_components/login/CMakeLists.txt (transplanted from
6ea6df364e22ba6f99b18a0e684ba4912f4f7223)
---
doc/contributions.txt | 1 +
indra/viewer_components/login/CMakeLists.txt | 22 ++++++++++++--------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 38059e1e29a..23050e718f7 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -171,6 +171,7 @@ Boroondas Gupte
SNOW-737
VWR-233
VWR-20583
+ VWR-20891
WEB-262
Bulli Schumann
CT-218
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt
index fb65779eb73..fe64926da6c 100644
--- a/indra/viewer_components/login/CMakeLists.txt
+++ b/indra/viewer_components/login/CMakeLists.txt
@@ -3,7 +3,9 @@
project(login)
include(00-Common)
-include(LLAddBuildTest)
+if(LL_TESTS)
+ include(LLAddBuildTest)
+endif(LL_TESTS)
include(LLCommon)
include(LLMath)
include(LLXML)
@@ -43,14 +45,16 @@ target_link_libraries(lllogin
${PTH_LIBRARIES}
)
-SET(lllogin_TEST_SOURCE_FILES
+if(LL_TESTS)
+ SET(lllogin_TEST_SOURCE_FILES
+ lllogin.cpp
+ )
+
+ set_source_files_properties(
lllogin.cpp
+ PROPERTIES
+ LL_TEST_ADDITIONAL_LIBRARIES "${PTH_LIBRARIES}"
)
-set_source_files_properties(
- lllogin.cpp
- PROPERTIES
- LL_TEST_ADDITIONAL_LIBRARIES "${PTH_LIBRARIES}"
- )
-
-LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}")
+ LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}")
+endif(LL_TESTS)
--
GitLab