From e0c7bd9a7eefb9bb630bcb2195404034688ca639 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 10 Jan 2020 00:54:01 +0200 Subject: [PATCH] Don't build tests when installing; link to Threads::Threads in tests because of lw_thread_test.cpp --- .travis.yml | 2 +- test/CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f75968..4ad48b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -342,7 +342,7 @@ matrix: env: CMAKE_INSTALL_TEST=1 script: - mkdir __build__ && cd __build__ - - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES="smart_ptr;assert;config;core;move;static_assert;throw_exception;type_traits" -DCMAKE_INSTALL_PREFIX=~/.local .. + - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES="smart_ptr;assert;config;core;move;static_assert;throw_exception;type_traits" -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=~/.local .. - cmake --build . --target install - cd ../libs/smart_ptr/test/cmake_install_test && mkdir __build__ && cd __build__ - cmake -DCMAKE_INSTALL_PREFIX=~/.local .. diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0004512..8dd7fcb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -6,6 +6,10 @@ include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST) if(HAVE_BOOST_TEST) -boost_test_jamfile(FILE Jamfile LINK_LIBRARIES Boost::smart_ptr Boost::core Boost::align Boost::atomic Boost::container_hash) +# for lw_thread_test.cpp +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_package(Threads) + +boost_test_jamfile(FILE Jamfile LINK_LIBRARIES Boost::smart_ptr Boost::core Boost::align Boost::atomic Boost::container_hash Threads::Threads) endif()