diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-12-21 14:26:41 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-12-21 14:26:41 -0800 |
| commit | 3edc3c5554965b947a8086c9f4f95a28b3a7aaa8 (patch) | |
| tree | c4dc655352cf0b57c3ef4aad1fca2c200a2ae3a0 /indra | |
| parent | 5ae42992917dd0e9318692c43f829685e80f45f3 (diff) | |
CMake fixes for Linux build
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/Boost.cmake | 2 | ||||
| -rwxr-xr-x | indra/viewer_components/updater/CMakeLists.txt | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 88af9a1513..180a84dbcf 100755 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -126,6 +126,6 @@ endif (USESYSTEMLIBS) if (LINUX) set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt) - set(BOOST_SYSTEM_LIBRARY ${BOOST_THREAD_LIBRARY} rt) + set(BOOST_THREAD_LIBRARY ${BOOST_THREAD_LIBRARY} rt) endif (LINUX) diff --git a/indra/viewer_components/updater/CMakeLists.txt b/indra/viewer_components/updater/CMakeLists.txt index 7f866336d9..73e18aacb3 100755 --- a/indra/viewer_components/updater/CMakeLists.txt +++ b/indra/viewer_components/updater/CMakeLists.txt @@ -69,13 +69,17 @@ target_link_libraries(llupdaterservice ) if(LL_TESTS) +if (NOT LINUX) SET(llupdater_service_TEST_SOURCE_FILES llupdaterservice.cpp ) set(test_libs - ${LLCOMMON_LIBRARIES}) - + ${LLCOMMON_LIBRARIES} + ${BOOST_COROUTINE_LIBRARY} + ${BOOST_CONTEXT_LIBRARY} + ${BOOST_THREAD_LIBRARY} + ${BOOST_SYSTEM_LIBRARY}) set_source_files_properties( llupdaterservice.cpp @@ -87,7 +91,6 @@ set_source_files_properties( # LL_TEST_ADDITIONAL_CFLAGS "-Dllifstream=llus_mock_llifstream" ) -if (NOT LINUX) LL_ADD_PROJECT_UNIT_TESTS(llupdaterservice "${llupdater_service_TEST_SOURCE_FILES}" ${test_libs}) endif (NOT LINUX) endif(LL_TESTS) |