diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-03-27 07:38:46 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-03-27 07:38:46 -0700 |
| commit | 3c486da165994cbe8afb2a0cdccd0720d0e1449b (patch) | |
| tree | 11ef8c1fc6fa2e803c8c47263ff8c27d43492f33 /indra | |
| parent | a83289f01f5d037f779991d732de9bf15ed3bda1 (diff) | |
Rollback the boost sys lib inclusion in integ tests as it was causing dup symbols
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/LLAddBuildTest.cmake | 1 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index c11fa09206..9bb3077797 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 bc2ef4f2c5..62d4af1737 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) |