Mercurial > malikania
changeset 207:10687519f46e
cmake: fix various problems
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 28 Nov 2018 21:18:00 +0100 |
parents | 12873699ad8b |
children | 263122adef77 |
files | cmake/function/MalikaniaDefineTest.cmake doc/html/CMakeLists.txt libmlk/CMakeLists.txt tests/libmlk/line/CMakeLists.txt tests/libmlk/point/CMakeLists.txt tests/libmlk/rectangle/CMakeLists.txt |
diffstat | 6 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/cmake/function/MalikaniaDefineTest.cmake Thu Nov 29 14:04:58 2018 +0100 +++ b/cmake/function/MalikaniaDefineTest.cmake Wed Nov 28 21:18:00 2018 +0100 @@ -51,6 +51,7 @@ target_compile_definitions( test-${TEST_NAME} PRIVATE + BOOST_TEST_DYN_LINK CMAKE_CURRENT_BINARY_DIR="${CMAKE_CURRENT_BINARY_DIR}" CMAKE_CURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}" CMAKE_BINARY_DIR="${CMAKE_BINARY_DIR}"
--- a/doc/html/CMakeLists.txt Thu Nov 29 14:04:58 2018 +0100 +++ b/doc/html/CMakeLists.txt Wed Nov 28 21:18:00 2018 +0100 @@ -27,9 +27,11 @@ malikania_setg(MALIKANIA_HAS_HTML On) malikania_setg(MALIKANIA_HAS_HTML_MSG "Yes") else () + malikania_setg(MALIKANIA_HAS_HTML Off) malikania_setg(MALIKANIA_HAS_HTML_MSG "No (disabled by user)") endif () else () + malikania_setg(MALIKANIA_HAS_HTML Off) malikania_setg(MALIKANIA_HAS_HTML_MSG "No (marker not found)") endif ()
--- a/libmlk/CMakeLists.txt Thu Nov 29 14:04:58 2018 +0100 +++ b/libmlk/CMakeLists.txt Wed Nov 28 21:18:00 2018 +0100 @@ -20,6 +20,7 @@ find_package(Boost REQUIRED date_time filesystem system) find_package(OpenSSL REQUIRED) +find_package(Threads REQUIRED) set( SOURCES @@ -55,6 +56,7 @@ PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> PUBLIC_LIBRARIES + Threads::Threads Boost::boost Boost::dynamic_linking Boost::disable_autolinking
--- a/tests/libmlk/line/CMakeLists.txt Thu Nov 29 14:04:58 2018 +0100 +++ b/tests/libmlk/line/CMakeLists.txt Wed Nov 28 21:18:00 2018 +0100 @@ -18,6 +18,6 @@ malikania_create_test( NAME line - LIBRARIES libmlk-client + LIBRARIES libmlk SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp )