From 3c486da165994cbe8afb2a0cdccd0720d0e1449b Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Wed, 27 Mar 2013 07:38:46 -0700
Subject: [PATCH] Rollback the boost sys lib inclusion in integ tests as it was
causing dup symbols
---
indra/cmake/LLAddBuildTest.cmake | 1 -
indra/newview/CMakeLists.txt | 6 ++++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index c11fa092062..9bb3077797d 100755
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -50,7 +50,6 @@ INCLUDE(GoogleMock)
)
SET(alltest_LIBRARIES
${GOOGLEMOCK_LIBRARIES}
- ${BOOST_SYSTEM_LIBRARY}
${PTHREAD_LIBRARY}
${WINDOWS_LIBRARIES}
)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index bc2ef4f2c5b..62d4af17376 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2082,6 +2082,12 @@ if (LL_TESTS)
LL_TEST_ADDITIONAL_LIBRARIES "${JSONCPP_LIBRARIES}"
)
+ set_source_files_properties(
+ lllogininstance.cpp
+ PROPERTIES
+ LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}"
+ )
+
LL_ADD_PROJECT_UNIT_TESTS(${VIEWER_BINARY_NAME} "${viewer_TEST_SOURCE_FILES}")
#set(TEST_DEBUG on)
--
GitLab