1 files changed, 42 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4056b5a..bf61eed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,51 +19,75 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules")
 include("ConanDependencies")
 include("SystemDependencies")
 
-add_library("core" OBJECT
+##### Wanda CORE #####
+
+set(WANDA_CORE_SOURCES
   "src/control_connection.cpp"
+  "src/environment.cpp"
+  "src/message.cpp"
+  "src/xdg.cpp"
+)
+
+set(WANDA_CORE_HEADERS
   "src/control_connection.hpp"
-  "src/control_interface.cpp"
-  "src/control_interface.hpp"
   "src/deferred_failure.hpp"
-  "src/environment.cpp"
   "src/environment.hpp"
   "src/keyed.hpp"
-  "src/message.cpp"
   "src/message.hpp"
   "src/optional.hpp"
   "src/type_wrapper.hpp"
-  "src/xdg.cpp"
   "src/xdg.hpp"
 )
 
-target_link_libraries("core"
+set(WANDA_CORE_LIBRARIES
   "CONAN_PKG::boost_asio"
   "CONAN_PKG::boost_program_options"
   "SYSTEM::C++FS"
   "Threads::Threads"
 )
 
-add_executable("wandad"
+add_library("core" OBJECT ${WANDA_CORE_SOURCES} ${WANDA_CORE_HEADERS})
+target_link_libraries("core" ${WANDA_CORE_LIBRARIES})
+
+##### Wanda Daemon #####
+
+set(WANDA_DAEMON_SOURCES
+  "src/control_interface.cpp"
   "src/filesystem.cpp"
-  "src/filesystem.hpp"
   "src/setting.cpp"
-  "src/setting.hpp"
   "src/wallpaper.cpp"
-  "src/wallpaper.hpp"
   "src/wandad.cpp"
-  )
+)
+
+set(WANDA_DAEMON_HEADERS
+  "src/control_interface.hpp"
+  "src/filesystem.hpp"
+  "src/setting.hpp"
+  "src/wallpaper.hpp"
+)
 
-target_link_libraries("wandad"
+set(WANDA_DAEMON_LIBRARIES
   "core"
   "SYSTEM::GIO"
-  )
+)
 
-add_executable("wandac"
+add_executable("wandad" ${WANDA_DAEMON_SOURCES} ${WANDA_DAEMON_HEADERS})
+target_link_libraries("wandad" ${WANDA_DAEMON_LIBRARIES})
+
+##### Wanda Controller #####
+
+set(WANDA_CONTROLLER_SOURCES
   "src/commander.cpp"
-  "src/commander.hpp"
   "src/wandac.cpp"
 )
 
-target_link_libraries("wandac"
+set(WANDA_CONTROLLER_HEADERS
+  "src/commander.hpp"
+)
+
+set(WANDA_CONTROLLER_LIBRARIES
   "core"
-)
-\ No newline at end of file
+)
+
+add_executable("wandac" ${WANDA_CONTROLLER_SOURCES} ${WANDA_CONTROLLER_HEADERS})
+target_link_libraries("wandac" ${WANDA_CONTROLLER_LIBRARIES})
+\ No newline at end of file