Mercurial > irccd
changeset 683:d30793525261
CMake: global cleanup, remove useless definitions and libraries
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Thu, 12 Apr 2018 19:30:43 +0200 |
| parents | 4f1cd9bf13c7 |
| children | 8d93e415c3b4 |
| files | CMakeLists.txt irccdctl/CMakeLists.txt irccdctl/main.cpp libcommon/CMakeLists.txt libirccd-js/CMakeLists.txt libirccd-test/irccd/test/plugin_test.hpp libirccd/CMakeLists.txt libirccdctl/CMakeLists.txt |
| diffstat | 8 files changed, 15 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Thu Apr 12 19:24:09 2018 +0200 +++ b/CMakeLists.txt Thu Apr 12 19:30:43 2018 +0200 @@ -37,7 +37,10 @@ # # doc - The documentation process. # extern - External libraries. -# lib - The irccd library +# libirccdctl - The irccdctl library. +# libirccd-js - Javascript bindings library. +# libirccd-test - Helpers for unit tests. +# libirccd - The irccd library. # irccd - The irccd executable. # irccdctl - The irccdctl utility. # plugins - Official irccd plugins.
--- a/irccdctl/CMakeLists.txt Thu Apr 12 19:24:09 2018 +0200 +++ b/irccdctl/CMakeLists.txt Thu Apr 12 19:30:43 2018 +0200 @@ -18,8 +18,6 @@ project(irccdctl) -find_package(Boost REQUIRED QUIET COMPONENTS timer) - set( SOURCES ${irccdctl_SOURCE_DIR}/CMakeLists.txt @@ -92,5 +90,5 @@ TARGET irccdctl DESCRIPTION "Irccd controller." SOURCES ${SOURCES} - LIBRARIES ${Boost_TIMER_LIBRARY} libirccdctl + LIBRARIES libirccdctl )
--- a/irccdctl/main.cpp Thu Apr 12 19:24:09 2018 +0200 +++ b/irccdctl/main.cpp Thu Apr 12 19:30:43 2018 +0200 @@ -21,7 +21,6 @@ #include <unordered_map> #include <boost/filesystem.hpp> -#include <boost/timer/timer.hpp> #include <irccd/config.hpp> #include <irccd/json_util.hpp>
--- a/libcommon/CMakeLists.txt Thu Apr 12 19:24:09 2018 +0200 +++ b/libcommon/CMakeLists.txt Thu Apr 12 19:30:43 2018 +0200 @@ -51,26 +51,25 @@ ${libcommon_SOURCE_DIR}/irccd/system.cpp ) -if (NOT HAVE_SSL) - list(APPEND FLAGS NET_NO_SSL) -endif () - irccd_define_library( TARGET libcommon SOURCES ${libcommon_SOURCE_DIR}/CMakeLists.txt ${HEADERS} ${SOURCES} - FLAGS ${FLAGS} LIBRARIES libextern-json - ${Boost_LIBRARIES} + Threads::Threads + Boost::filesystem + Boost::system + $<$<BOOL:${HAVE_SSL}>:OpenSSL::Crypto> + $<$<BOOL:${HAVE_SSL}>:OpenSSL::SSL> + $<$<BOOL:${IRCCD_SYSTEM_LINUX}>:dl> + $<$<BOOL:${IRCCD_SYSTEM_MAC}>:resolv> + $<$<BOOL:${IRCCD_SYSTEM_WINDOWS}>:mswsock> $<$<BOOL:${WIN32}>:shlwapi> $<$<BOOL:${WIN32}>:ws2_32> - $<$<BOOL:${HAVE_SSL}>:OpenSSL::SSL> - $<$<BOOL:${HAVE_SSL}>:OpenSSL::Crypto> PUBLIC_INCLUDES - ${Boost_INCLUDE_DIRS} $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}> $<BUILD_INTERFACE:${libcommon_SOURCE_DIR}> )
--- a/libirccd-js/CMakeLists.txt Thu Apr 12 19:24:09 2018 +0200 +++ b/libirccd-js/CMakeLists.txt Thu Apr 12 19:30:43 2018 +0200 @@ -64,10 +64,9 @@ ${HEADERS} ${SOURCES} LIBRARIES - ${Boost_TIMER_LIBRARY} + Boost::timer libextern-duktape libirccd PUBLIC_INCLUDES - $<BUILD_INTERFACE:${libirccd-js_SOURCE_DIR}/irccd> $<BUILD_INTERFACE:${libirccd-js_SOURCE_DIR}> )
--- a/libirccd-test/irccd/test/plugin_test.hpp Thu Apr 12 19:24:09 2018 +0200 +++ b/libirccd-test/irccd/test/plugin_test.hpp Thu Apr 12 19:30:43 2018 +0200 @@ -28,7 +28,7 @@ #include <irccd/daemon/irccd.hpp> -#include <js/js_plugin.hpp> +#include <irccd/js/js_plugin.hpp> #include "journal_server.hpp"
--- a/libirccd/CMakeLists.txt Thu Apr 12 19:24:09 2018 +0200 +++ b/libirccd/CMakeLists.txt Thu Apr 12 19:30:43 2018 +0200 @@ -18,8 +18,6 @@ project(libirccd) -find_package(Boost REQUIRED QUIET COMPONENTS timer) - set( HEADERS ${libirccd_SOURCE_DIR}/irccd/daemon/command.hpp @@ -123,11 +121,6 @@ ${HEADERS} ${SOURCES} LIBRARIES - Threads::Threads - ${Boost_TIMER_LIBRARY} - $<$<BOOL:${IRCCD_SYSTEM_WINDOWS}>:mswsock> - $<$<BOOL:${IRCCD_SYSTEM_LINUX}>:dl> - $<$<BOOL:${IRCCD_SYSTEM_MAC}>:resolv> libcommon PUBLIC_INCLUDES $<BUILD_INTERFACE:${libirccd_SOURCE_DIR}>