Skip to content
Snippets Groups Projects
Commit 1422f896 authored by Monty Brandenberg's avatar Monty Brandenberg
Browse files

Linux: Finish new Boost dependencies to get Linux building again.

parent 46943870
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,7 @@ if (STANDALONE) ...@@ -18,7 +18,7 @@ if (STANDALONE)
else (STANDALONE) else (STANDALONE)
use_prebuilt_binary(boost) use_prebuilt_binary(boost)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
set(BOOST_VERSION "1.52") set(BOOST_VERSION "1.55")
if (WINDOWS) if (WINDOWS)
if(MSVC80) if(MSVC80)
......
...@@ -345,7 +345,7 @@ if (LL_TESTS) ...@@ -345,7 +345,7 @@ if (LL_TESTS)
LL_ADD_INTEGRATION_TEST(reflection "" "${test_libs}") LL_ADD_INTEGRATION_TEST(reflection "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(stringize "" "${test_libs}") LL_ADD_INTEGRATION_TEST(stringize "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(lleventdispatcher "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lleventdispatcher "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(lleventcoro "" "${test_libs};${BOOST_CONTEXT_LIBRARY};${BOOST_COROUTINE_LIBRARY}") LL_ADD_INTEGRATION_TEST(lleventcoro "" "${test_libs};${BOOST_CONTEXT_LIBRARY};${BOOST_COROUTINE_LIBRARY};${BOOST_SYSTEM_LIBRARY}")
LL_ADD_INTEGRATION_TEST(llprocess "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llprocess "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llleap "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llleap "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llstreamqueue "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llstreamqueue "" "${test_libs}")
......
...@@ -46,6 +46,8 @@ target_link_libraries(lllogin ...@@ -46,6 +46,8 @@ target_link_libraries(lllogin
${LLMATH_LIBRARIES} ${LLMATH_LIBRARIES}
${LLXML_LIBRARIES} ${LLXML_LIBRARIES}
${BOOST_CONTEXT_LIBRARY} ${BOOST_CONTEXT_LIBRARY}
${BOOST_COROUTINE_LIBRARY}
${BOOST_SYSTEM_LIBRARY}
) )
if(LL_TESTS) if(LL_TESTS)
...@@ -55,7 +57,7 @@ if(LL_TESTS) ...@@ -55,7 +57,7 @@ if(LL_TESTS)
set_source_files_properties( set_source_files_properties(
lllogin.cpp lllogin.cpp
PROPERTIES PROPERTIES
LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_CONTEXT_LIBRARY};${BOOST_COROUTINE_LIBRARY}" LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_CONTEXT_LIBRARY};${BOOST_COROUTINE_LIBRARY};${BOOST_SYSTEM_LIBRARY}"
) )
LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}") LL_ADD_PROJECT_UNIT_TESTS(lllogin "${lllogin_TEST_SOURCE_FILES}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment