# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1523554243 -7200
# Node ID d30793525261716b21ae1d08d54249c3788cbe89
# Parent  4f1cd9bf13c72175b5947eb3fa408143eaa1bb59
CMake: global cleanup, remove useless definitions and libraries

diff -r 4f1cd9bf13c7 -r d30793525261 CMakeLists.txt
--- 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.
diff -r 4f1cd9bf13c7 -r d30793525261 irccdctl/CMakeLists.txt
--- 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
 )
diff -r 4f1cd9bf13c7 -r d30793525261 irccdctl/main.cpp
--- 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>
diff -r 4f1cd9bf13c7 -r d30793525261 libcommon/CMakeLists.txt
--- 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}>
 )
diff -r 4f1cd9bf13c7 -r d30793525261 libirccd-js/CMakeLists.txt
--- 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}>
 )
diff -r 4f1cd9bf13c7 -r d30793525261 libirccd-test/irccd/test/plugin_test.hpp
--- 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"
 
diff -r 4f1cd9bf13c7 -r d30793525261 libirccd/CMakeLists.txt
--- 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}>
diff -r 4f1cd9bf13c7 -r d30793525261 libirccdctl/CMakeLists.txt
--- a/libirccdctl/CMakeLists.txt	Thu Apr 12 19:24:09 2018 +0200
+++ b/libirccdctl/CMakeLists.txt	Thu Apr 12 19:30:43 2018 +0200
@@ -35,9 +35,6 @@
         ${HEADERS}
         ${SOURCES}
     LIBRARIES
-        Threads::Threads
-        ${LIBRARIES}
-        libcommon
         libirccd
     PUBLIC_INCLUDES
         $<BUILD_INTERFACE:${libirccdctl_SOURCE_DIR}>