Rollback the boost sys lib inclusion in integ tests as it was causing dup symbols

meow-7.2.2
Graham Madarasz 2013-03-27 07:38:46 -07:00
parent a83289f01f
commit 3c486da165
2 changed files with 6 additions and 1 deletions

View File

@ -50,7 +50,6 @@ INCLUDE(GoogleMock)
)
SET(alltest_LIBRARIES
${GOOGLEMOCK_LIBRARIES}
${BOOST_SYSTEM_LIBRARY}
${PTHREAD_LIBRARY}
${WINDOWS_LIBRARIES}
)

View File

@ -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)