summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorsimon <none@none>2014-08-21 09:11:11 -0700
committersimon <none@none>2014-08-21 09:11:11 -0700
commit95a14433b8b6375b8d62970c6df5a08d98764423 (patch)
tree8578902253fc5454827e24eedc39717be9d987e2 /indra/viewer_components
parenta14ba78dbbfc925c94f1e8ed94b52bc08e626e3d (diff)
parent518cc86156c2e10b9e603ac9e661f8c35faf5f70 (diff)
Merge downstream code into viewer-lion and become version 3.7.15
Diffstat (limited to 'indra/viewer_components')
-rwxr-xr-xindra/viewer_components/login/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt
index 6f366677c9..ce80d55829 100755
--- a/indra/viewer_components/login/CMakeLists.txt
+++ b/indra/viewer_components/login/CMakeLists.txt
@@ -46,6 +46,8 @@ target_link_libraries(lllogin
${LLMATH_LIBRARIES}
${LLXML_LIBRARIES}
${BOOST_CONTEXT_LIBRARY}
+ ${BOOST_COROUTINE_LIBRARY}
+ ${BOOST_SYSTEM_LIBRARY}
)
if(LL_TESTS)
@@ -55,7 +57,7 @@ if(LL_TESTS)
set_source_files_properties(
lllogin.cpp
PROPERTIES
- LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_CONTEXT_LIBRARY}"
+ LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_CONTEXT_LIBRARY};${BOOST_COROUTINE_LIBRARY};${BOOST_SYSTEM_LIBRARY}"
)
LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}")