Mercurial > irccd
changeset 601:48c6a1167245
CMake: give FindThreads a try
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 06 Dec 2017 21:47:11 +0100 |
| parents | 080800ce4f1e |
| children | 24959a94de96 |
| files | CMakeLists.txt cmake/function/IrccdDefineTest.cmake irccd/CMakeLists.txt libirccd/CMakeLists.txt libirccdctl/CMakeLists.txt |
| diffstat | 5 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Dec 06 21:40:50 2017 +0100 +++ b/CMakeLists.txt Wed Dec 06 21:47:11 2017 +0100 @@ -75,6 +75,8 @@ include(cmake/IrccdOptions.cmake) include(cmake/IrccdSystem.cmake) +find_package(Threads REQUIRED) + add_subdirectory(extern/json) add_subdirectory(doc) add_subdirectory(libcommon)
--- a/cmake/function/IrccdDefineTest.cmake Wed Dec 06 21:40:50 2017 +0100 +++ b/cmake/function/IrccdDefineTest.cmake Wed Dec 06 21:47:11 2017 +0100 @@ -94,10 +94,6 @@ ) endforeach() - if (UNIX) - set_target_properties(test-${TEST_NAME} PROPERTIES LINK_FLAGS -pthread) - endif () - # And test add_test( NAME test-${TEST_NAME}
--- a/irccd/CMakeLists.txt Wed Dec 06 21:40:50 2017 +0100 +++ b/irccd/CMakeLists.txt Wed Dec 06 21:47:11 2017 +0100 @@ -26,7 +26,6 @@ LIBRARIES libirccd $<$<BOOL:${HAVE_JS}>:libirccd-js> - $<$<BOOL:${UNIX}>:-pthread> ) if (IRCCD_SYSTEM_MAC)
--- a/libirccd/CMakeLists.txt Wed Dec 06 21:40:50 2017 +0100 +++ b/libirccd/CMakeLists.txt Wed Dec 06 21:47:11 2017 +0100 @@ -74,6 +74,7 @@ ${SOURCES} LIBRARIES Boost::timer + Threads::Threads $<$<BOOL:${IRCCD_SYSTEM_LINUX}>:dl> $<$<BOOL:${IRCCD_SYSTEM_MAC}>:resolv> libcommon
--- a/libirccdctl/CMakeLists.txt Wed Dec 06 21:40:50 2017 +0100 +++ b/libirccdctl/CMakeLists.txt Wed Dec 06 21:47:11 2017 +0100 @@ -33,7 +33,6 @@ ) if (NOT IRCCD_SYSTEM_WINDOWS) - list(APPEND LIBRARIES -pthread) list(APPEND HEADERS ${libirccdctl_SOURCE_DIR}/irccd/ctl/local_connection.hpp) list(APPEND SOURCES ${libirccdctl_SOURCE_DIR}/irccd/ctl/local_connection.cpp) endif () @@ -45,6 +44,7 @@ ${HEADERS} ${SOURCES} LIBRARIES + Threads::Threads ${LIBRARIES} libcommon libirccd