summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-07-12 10:57:13 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-07-12 10:57:13 -0400
commit8e6bea61a9763703b89e1da220b9d67573f9fb7c (patch)
treeb4c6e5a7c002d2ed6bdf17142c1d6ffd3fb35430 /indra/viewer_components
parentf1be78f7e235bfe9395eed748154d77763d5ea65 (diff)
MAINT-5351: llupdaterservice_test now needs Boost System library.
Diffstat (limited to 'indra/viewer_components')
-rwxr-xr-xindra/viewer_components/updater/CMakeLists.txt15
1 files changed, 9 insertions, 6 deletions
diff --git a/indra/viewer_components/updater/CMakeLists.txt b/indra/viewer_components/updater/CMakeLists.txt
index 53e309290f..0d44334276 100755
--- a/indra/viewer_components/updater/CMakeLists.txt
+++ b/indra/viewer_components/updater/CMakeLists.txt
@@ -6,6 +6,7 @@ include(00-Common)
if(LL_TESTS)
include(LLAddBuildTest)
endif(LL_TESTS)
+include(Boost)
include(CMakeCopyIfDifferent)
include(CURL)
include(LLCommon)
@@ -72,14 +73,16 @@ if(LL_TESTS)
llupdaterservice.cpp
)
+
+set_source_files_properties(
+ llupdaterservice.cpp
+ PROPERTIES
+ LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}"
# *NOTE:Mani - I was trying to use the preprocessor seam to mock out
-# llifstream (and other) llcommon classes. I didn't work
+# llifstream (and other) llcommon classes. It didn't work
# because of the windows declspec(dllimport)attribute.
-#set_source_files_properties(
-# llupdaterservice.cpp
-# PROPERTIES
-# LL_TEST_ADDITIONAL_CFLAGS "-Dllifstream=llus_mock_llifstream"
-# )
+# LL_TEST_ADDITIONAL_CFLAGS "-Dllifstream=llus_mock_llifstream"
+ )
LL_ADD_PROJECT_UNIT_TESTS(llupdaterservice "${llupdater_service_TEST_SOURCE_FILES}")
endif(LL_TESTS)