diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-07 15:11:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-07 15:11:55 -0400 |
| commit | 545e033d1e008f4b1da330d6967b363c7d09feca (patch) | |
| tree | 73e1a622a224b81bce076d38a8c4140e43c8deb9 /indra/viewer_components/login | |
| parent | f382233fbb29bf81fc4009930dc134253d8ea250 (diff) | |
| parent | 0f3d291ef61deeb015dec332cf19822b63be2402 (diff) | |
merge changes for DRTVWR-299
Diffstat (limited to 'indra/viewer_components/login')
| -rwxr-xr-x | indra/viewer_components/login/CMakeLists.txt | 7 | ||||
| -rwxr-xr-x | indra/viewer_components/login/lllogin.cpp | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/viewer_components/login/CMakeLists.txt b/indra/viewer_components/login/CMakeLists.txt index 658f167c2e..6f366677c9 100755 --- a/indra/viewer_components/login/CMakeLists.txt +++ b/indra/viewer_components/login/CMakeLists.txt @@ -9,6 +9,7 @@ endif(LL_TESTS) include(LLCommon) include(LLMath) include(LLXML) +include(Boost) include_directories( ${LLCOMMON_INCLUDE_DIRS} @@ -44,12 +45,18 @@ target_link_libraries(lllogin ${LLCOMMON_LIBRARIES} ${LLMATH_LIBRARIES} ${LLXML_LIBRARIES} + ${BOOST_CONTEXT_LIBRARY} ) if(LL_TESTS) SET(lllogin_TEST_SOURCE_FILES lllogin.cpp ) + set_source_files_properties( + lllogin.cpp + PROPERTIES + LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_CONTEXT_LIBRARY}" + ) LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}") endif(LL_TESTS) diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp index bdcb068200..3357ad812d 100755 --- a/indra/viewer_components/login/lllogin.cpp +++ b/indra/viewer_components/login/lllogin.cpp @@ -23,7 +23,6 @@ * $/LicenseInfo$ */ -#include <boost/coroutine/coroutine.hpp> #include "linden_common.h" #include "llsd.h" #include "llsdutil.h" |