wanda: extract core components

2 files changed, 21 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbb15a6..a8f6d2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,32 +19,42 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules")
 include("ConanDependencies")
 include("SystemDependencies")
 
-add_executable("wanda"
-  # Executable
-  "src/main.cpp"
-
-  # Components
+add_library("core" OBJECT
   "src/control_connection.cpp"
   "src/control_connection.hpp"
   "src/control_interface.cpp"
   "src/control_interface.hpp"
   "src/deferred_failure.hpp"
-  "src/filesystem.cpp"
-  "src/filesystem.hpp"
   "src/keyed.hpp"
   "src/optional.hpp"
+  "src/type_wrapper.hpp"
+)
+
+target_link_libraries("core"
+  "CONAN_PKG::boost_asio"
+)
+
+add_executable("wandad"
+  "src/filesystem.cpp"
+  "src/filesystem.hpp"
   "src/setting.cpp"
   "src/setting.hpp"
-  "src/type_wrapper.hpp"
   "src/wallpaper.cpp"
   "src/wallpaper.hpp"
+  "src/wandad.cpp"
   )
 
-target_link_libraries("wanda"
-  "CONAN_PKG::boost_asio"
-  "CONAN_PKG::boost_config"
+target_link_libraries("wandad"
+  # Internal components
+  "core"
+
+  # Conan dependencies
   "CONAN_PKG::boost_program_options"
+
+  # System dependencies
   "SYSTEM::C++FS"
   "SYSTEM::GIO"
+
+  # CMake dependencies
   "Threads::Threads"
   )
diff --git a/src/main.cpp b/src/wandad.cpp
index 169efd9..169efd9 100644
--- a/src/main.cpp
+++ b/src/wandad.cpp