From 4da34679618f981ff49669158ccfbeaad6712279 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 26 Mar 2013 10:33:02 -0400
Subject: [PATCH] Add Boost System library to all tests I don't know what added
this requirement, but this last night lots of them started failing to link.
Also remove some obsolete commented-out stuff
---
indra/cmake/LLAddBuildTest.cmake | 1 +
indra/newview/CMakeLists.txt | 23 +----------------------
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 9bb3077797d..c11fa092062 100755
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -50,6 +50,7 @@ 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 a405baf50dd..bc2ef4f2c5b 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2082,32 +2082,11 @@ if (LL_TESTS)
LL_TEST_ADDITIONAL_LIBRARIES "${JSONCPP_LIBRARIES}"
)
- set_source_files_properties(
- lllogininstance.cpp
- PROPERTIES
- LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}"
- )
-
- ##################################################
- # DISABLING PRECOMPILED HEADERS USAGE FOR TESTS
- ##################################################
- # if(USE_PRECOMPILED_HEADERS)
- # set_source_files_properties(
- # ${viewer_TEST_SOURCE_FILES}
- # PROPERTIES
- # LL_TEST_ADDITIONAL_SOURCE_FILES llviewerprecompiledheaders.cpp
- # )
- # endif(USE_PRECOMPILED_HEADERS)
LL_ADD_PROJECT_UNIT_TESTS(${VIEWER_BINARY_NAME} "${viewer_TEST_SOURCE_FILES}")
#set(TEST_DEBUG on)
set(test_sources llcapabilitylistener.cpp)
- ##################################################
- # DISABLING PRECOMPILED HEADERS USAGE FOR TESTS
- ##################################################
- # if(USE_PRECOMPILED_HEADERS)
- # set(test_sources "${test_sources}" llviewerprecompiledheaders.cpp)
- # endif(USE_PRECOMPILED_HEADERS)
+
set(test_libs
${LLMESSAGE_LIBRARIES}
${WINDOWS_LIBRARIES}
--
GitLab