diff options
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/Boost.cmake | 5 | ||||
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | indra/viewer_components/updater/CMakeLists.txt | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 25e54b7cbd..d239e1f3b0 100755 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -123,3 +123,8 @@ else (USESYSTEMLIBS) debug boost_thread-mt-d) endif (WINDOWS) endif (USESYSTEMLIBS) + +if (LINUX) + set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt) +endif (LINUX) + diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index fecdaef97e..079751aaf7 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2240,6 +2240,7 @@ if (LL_TESTS) ) set(test_libs + ${LLCOMMON_LIBRARIES} ${JSONCPP_LIBRARIES} ${CURL_LIBRARIES} ) diff --git a/indra/viewer_components/updater/CMakeLists.txt b/indra/viewer_components/updater/CMakeLists.txt index 48c065c2ed..7f866336d9 100755 --- a/indra/viewer_components/updater/CMakeLists.txt +++ b/indra/viewer_components/updater/CMakeLists.txt @@ -73,18 +73,23 @@ if(LL_TESTS) llupdaterservice.cpp ) +set(test_libs + ${LLCOMMON_LIBRARIES}) + set_source_files_properties( llupdaterservice.cpp PROPERTIES - LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}" + LL_TEST_ADDITIONAL_LIBRARIES ${test_libs} # *NOTE:Mani - I was trying to use the preprocessor seam to mock out # llifstream (and other) llcommon classes. It didn't work # because of the windows declspec(dllimport)attribute. # LL_TEST_ADDITIONAL_CFLAGS "-Dllifstream=llus_mock_llifstream" ) - LL_ADD_PROJECT_UNIT_TESTS(llupdaterservice "${llupdater_service_TEST_SOURCE_FILES}") +if (NOT LINUX) + LL_ADD_PROJECT_UNIT_TESTS(llupdaterservice "${llupdater_service_TEST_SOURCE_FILES}" ${test_libs}) +endif (NOT LINUX) endif(LL_TESTS) set(UPDATER_INCLUDE_DIRS |