35 files changed, 155 insertions, 166 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index fa60a91..0f9b893 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,5 @@
 {
     "C_Cpp.autoAddFileAssociations": false,
     "C_Cpp.clang_format_style": "file",
+    "python.terminal.activateEnvironment": true
 }
 \ No newline at end of file
diff --git a/conanfile.py b/conanfile.py
index f152f2a..f05875f 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -1,3 +1,5 @@
+import os
+
 from conans import ConanFile
 from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
 
@@ -8,10 +10,16 @@ class Wanda(ConanFile):
     url = "https://github.com/fmorgner/wanda"
     license = "BSD 3-clause"
     description = "A wallpaper changer for the GNOME"
+    scm = {
+        "type": "git",
+        "url": "auto",
+        "revision": "auto",
+    }
     generators = (
         "CMakeDeps",
-        "virtualenv",
     )
+    options = {"shared": [True, False]}
+    default_options = {"shared": False}
     settings = (
         "os",
         "arch",
@@ -19,11 +27,7 @@ class Wanda(ConanFile):
         "build_type",
     )
     exports_sources = (
-        "CMakeLists.txt",
-        "src/*",
-        "include/*",
-        "lib/*",
-        "test/*"
+        "source/*",
     )
     requires = (
         "asio/[~=1.24.0]",
@@ -56,3 +60,4 @@ class Wanda(ConanFile):
 
     def package_info(self):
         self.cpp_info.libs = ["wanda"]
+        self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 6d1ec20..90cd012 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -8,123 +8,5 @@ project("wanda"
 set(CMAKE_THREAD_PREFER_PTHREAD ON)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 
-find_package("asio")
-find_package("Boost")
-find_package("JPEG")
-find_package("PNG")
-find_package("lyra")
-find_package("spdlog")
-find_package("Threads")
-
-find_package("PkgConfig" REQUIRED)
-
-pkg_check_modules("GIO"
-  REQUIRED
-  IMPORTED_TARGET
-  GLOBAL
-  "gio-2.0"
-)
-
-pkg_check_modules("libmagic"
-  REQUIRED
-  IMPORTED_TARGET
-  GLOBAL
-  "libmagic"
-)
-
-# Core Library
-
-add_library("${PROJECT_NAME}" STATIC
-  "${PROJECT_SOURCE_DIR}/src/wanda/command.cpp"
-  "${PROJECT_SOURCE_DIR}/src/wanda/control_connection.cpp"
-  "${PROJECT_SOURCE_DIR}/src/wanda/environment.cpp"
-  "${PROJECT_SOURCE_DIR}/src/wanda/logging.cpp"
-  "${PROJECT_SOURCE_DIR}/src/wanda/message.cpp"
-  "${PROJECT_SOURCE_DIR}/src/wanda/xdg.cpp"
-
-  "${PROJECT_SOURCE_DIR}/include/wanda/command.hpp"
-  "${PROJECT_SOURCE_DIR}/include/wanda/control_connection.hpp"
-  "${PROJECT_SOURCE_DIR}/include/wanda/deferred_failure.hpp"
-  "${PROJECT_SOURCE_DIR}/include/wanda/environment.hpp"
-  "${PROJECT_SOURCE_DIR}/include/wanda/expected.hpp"
-  "${PROJECT_SOURCE_DIR}/include/wanda/keyed.hpp"
-  "${PROJECT_SOURCE_DIR}/include/wanda/logging.hpp"
-  "${PROJECT_SOURCE_DIR}/include/wanda/message.hpp"
-  "${PROJECT_SOURCE_DIR}/include/wanda/optional.hpp"
-  "${PROJECT_SOURCE_DIR}/include/wanda/type_wrapper.hpp"
-  "${PROJECT_SOURCE_DIR}/include/wanda/xdg.hpp"
-)
-
-target_compile_features("${PROJECT_NAME}" PUBLIC
-  "cxx_std_20"
-)
-
-target_link_libraries("${PROJECT_NAME}" PUBLIC
-  "asio::asio"
-  "spdlog::spdlog"
-  "Threads::Threads"
-)
-
-target_include_directories("${PROJECT_NAME}" SYSTEM
-  PUBLIC "${PROJECT_SOURCE_DIR}/include"
-)
-
-set_target_properties("${PROJECT_NAME}" PROPERTIES
-  CXX_STANDARD_REQUIRED YES
-  CXX_EXTENSIONS OFF
-)
-
-# Core Executables
-
-add_executable("${PROJECT_NAME}d"
-  "${PROJECT_SOURCE_DIR}/src/${PROJECT_NAME}/control_interface.cpp"
-  "${PROJECT_SOURCE_DIR}/src/${PROJECT_NAME}/filesystem.cpp"
-  "${PROJECT_SOURCE_DIR}/src/${PROJECT_NAME}/setting.cpp"
-  "${PROJECT_SOURCE_DIR}/src/${PROJECT_NAME}/wallpaper.cpp"
-  "${PROJECT_SOURCE_DIR}/src/${PROJECT_NAME}/wandad.cpp"
-
-  "${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/control_interface.hpp"
-  "${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/filesystem.hpp"
-  "${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/setting.hpp"
-  "${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/wallpaper.hpp"
-)
-
-target_link_libraries("${PROJECT_NAME}d" PRIVATE
-  "${PROJECT_NAME}"
-  "bfg::lyra"
-  "boost::boost"
-  "JPEG::JPEG"
-  "PkgConfig::GIO"
-  "PkgConfig::libmagic"
-  "PNG::PNG"
-)
-
-set_target_properties("${PROJECT_NAME}d" PROPERTIES
-  CXX_STANDARD_REQUIRED YES
-  CXX_EXTENSIONS OFF
-)
-
-add_executable("${PROJECT_NAME}c"
-  "${PROJECT_SOURCE_DIR}/src/${PROJECT_NAME}/commander.cpp"
-  "${PROJECT_SOURCE_DIR}/src/${PROJECT_NAME}/wandac.cpp"
-
-  "${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/commander.hpp"
-)
-
-target_link_libraries("${PROJECT_NAME}c" PRIVATE
-  "${PROJECT_NAME}"
-  "bfg::lyra"
-)
-
-set_target_properties("${PROJECT_NAME}c" PROPERTIES
-  CXX_STANDARD_REQUIRED YES
-  CXX_EXTENSIONS OFF
-)
-
-# Install Targets
-
-install(TARGETS
-  "${PROJECT_NAME}"
-  "${PROJECT_NAME}c"
-  "${PROJECT_NAME}d"
-)
+add_subdirectory("app")
+add_subdirectory("lib")
diff --git a/source/app/CMakeLists.txt b/source/app/CMakeLists.txt
new file mode 100644
index 0000000..a224b57
--- /dev/null
+++ b/source/app/CMakeLists.txt
@@ -0,0 +1,43 @@
+include("CheckIPOSupported")
+
+check_ipo_supported(RESULT "WANDA_IPO_SUPPORTED")
+
+find_package("lyra")
+
+#[=====[ Server ]=====]
+
+add_executable("wandad"
+  "src/wandad.cpp"
+)
+
+target_link_libraries("wandad" PRIVATE
+  "bfg::lyra"
+  "wanda::wanda"
+)
+
+set_target_properties("wandad" PROPERTIES
+  CXX_STANDARD_REQUIRED YES
+  CXX_EXTENSIONS OFF
+  INTERPROCEDURAL_OPTIMIZATION ${WANDA_IPO_SUPPORTED}
+)
+
+install(TARGETS "wandad")
+
+#[=====[ Client ]=====]
+
+add_executable("wandac"
+  "src/wandac.cpp"
+)
+
+target_link_libraries("${PROJECT_NAME}c" PRIVATE
+  "bfg::lyra"
+  "wanda::wanda"
+)
+
+set_target_properties("wandac" PROPERTIES
+  CXX_STANDARD_REQUIRED YES
+  CXX_EXTENSIONS OFF
+  INTERPROCEDURAL_OPTIMIZATION ${WANDA_IPO_SUPPORTED}
+)
+
+install(TARGETS "wandac")
+\ No newline at end of file
diff --git a/source/src/wanda/wandac.cpp b/source/app/src/wandac.cpp
index 1873ef4..1873ef4 100644
--- a/source/src/wanda/wandac.cpp
+++ b/source/app/src/wandac.cpp
diff --git a/source/src/wanda/wandad.cpp b/source/app/src/wandad.cpp
index 8579a83..8579a83 100644
--- a/source/src/wanda/wandad.cpp
+++ b/source/app/src/wandad.cpp
diff --git a/source/lib/CMakeLists.txt b/source/lib/CMakeLists.txt
new file mode 100644
index 0000000..bf3cd5f
--- /dev/null
+++ b/source/lib/CMakeLists.txt
@@ -0,0 +1,66 @@
+find_package("asio")
+find_package("Boost")
+find_package("JPEG")
+find_package("PNG")
+find_package("spdlog")
+find_package("Threads")
+
+find_package("PkgConfig" REQUIRED)
+
+pkg_check_modules("GIO"
+  REQUIRED
+  IMPORTED_TARGET
+  GLOBAL
+  "gio-2.0"
+)
+
+pkg_check_modules("libmagic"
+  REQUIRED
+  IMPORTED_TARGET
+  GLOBAL
+  "libmagic"
+)
+
+file(GLOB_RECURSE WANDA_LIB_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" CONFIGURE_DEPENDS "**/*.cpp")
+file(GLOB_RECURSE WANDA_LIB_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" CONFIGURE_DEPENDS "**/*.hpp")
+
+add_library("wanda")
+
+target_sources("wanda" PRIVATE
+    ${WANDA_LIB_SOURCES}
+)
+
+target_sources("wanda" INTERFACE
+    FILE_SET HEADERS
+    FILES ${WANDA_LIB_HEADERS}
+    BASE_DIRS "include"
+)
+
+target_include_directories("wanda" PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+target_include_directories("wanda" SYSTEM PUBLIC
+    $<INSTALL_INTERFACE:include>
+)
+
+target_compile_features("wanda" PUBLIC
+    "cxx_std_20"
+)
+
+target_link_libraries("wanda" PUBLIC
+    "asio::asio"
+    "boost::boost"
+    "JPEG::JPEG"
+    "PkgConfig::GIO"
+    "PkgConfig::libmagic"
+    "PNG::PNG"
+    "spdlog::spdlog"
+    "Threads::Threads"
+)
+
+install(TARGETS "wanda"
+    FILE_SET HEADERS
+)
+
+add_library("wanda::wanda" ALIAS "wanda")
diff --git a/source/include/wanda/command.hpp b/source/lib/include/wanda/command.hpp
index 5ea1a08..67938de 100644
--- a/source/include/wanda/command.hpp
+++ b/source/lib/include/wanda/command.hpp
@@ -1,7 +1,7 @@
 #ifndef WANDA_COMMAND_HPP
 #define WANDA_COMMAND_HPP
 
-#include <wanda/message.hpp>
+#include "wanda/message.hpp"
 
 #include <optional>
 #include <string>
diff --git a/source/include/wanda/commander.hpp b/source/lib/include/wanda/commander.hpp
index 1c76c6d..52fbbb8 100644
--- a/source/include/wanda/commander.hpp
+++ b/source/lib/include/wanda/commander.hpp
@@ -1,9 +1,9 @@
 #ifndef WANDA_COMMANDER_HPP
 #define WANDA_COMMANDER_HPP
 
-#include <wanda/command.hpp>
-#include <wanda/control_connection.hpp>
-#include <wanda/message.hpp>
+#include "wanda/command.hpp"
+#include "wanda/control_connection.hpp"
+#include "wanda/message.hpp"
 
 #include <asio.hpp>
 
diff --git a/source/include/wanda/control_connection.hpp b/source/lib/include/wanda/control_connection.hpp
index b692d37..cfab0df 100644
--- a/source/include/wanda/control_connection.hpp
+++ b/source/lib/include/wanda/control_connection.hpp
@@ -1,8 +1,8 @@
 #ifndef WANDA_CONTROL_CONNECTION_HPP
 #define WANDA_CONTROL_CONNECTION_HPP
 
-#include <wanda/keyed.hpp>
-#include <wanda/message.hpp>
+#include "wanda/keyed.hpp"
+#include "wanda/message.hpp"
 
 #include <asio.hpp>
 
diff --git a/source/include/wanda/control_interface.hpp b/source/lib/include/wanda/control_interface.hpp
index 73ef2cf..4f4da87 100644
--- a/source/include/wanda/control_interface.hpp
+++ b/source/lib/include/wanda/control_interface.hpp
@@ -7,9 +7,9 @@
 #ifndef WANDA_CONTROL_INTERFACE_HPP
 #define WANDA_CONTROL_INTERFACE_HPP
 
-#include <wanda/command.hpp>
-#include <wanda/control_connection.hpp>
-#include <wanda/keyed.hpp>
+#include "wanda/command.hpp"
+#include "wanda/control_connection.hpp"
+#include "wanda/keyed.hpp"
 
 #include <asio.hpp>
 #include <spdlog/spdlog.h>
diff --git a/source/include/wanda/deferred_failure.hpp b/source/lib/include/wanda/deferred_failure.hpp
index 5db26f6..5db26f6 100644
--- a/source/include/wanda/deferred_failure.hpp
+++ b/source/lib/include/wanda/deferred_failure.hpp
diff --git a/source/include/wanda/environment.hpp b/source/lib/include/wanda/environment.hpp
index 5a702a8..5a702a8 100644
--- a/source/include/wanda/environment.hpp
+++ b/source/lib/include/wanda/environment.hpp
diff --git a/source/include/wanda/expected.hpp b/source/lib/include/wanda/expected.hpp
index fff0d81..fff0d81 100644
--- a/source/include/wanda/expected.hpp
+++ b/source/lib/include/wanda/expected.hpp
diff --git a/source/include/wanda/filesystem.hpp b/source/lib/include/wanda/filesystem.hpp
index 1975bc5..1975bc5 100644
--- a/source/include/wanda/filesystem.hpp
+++ b/source/lib/include/wanda/filesystem.hpp
diff --git a/source/include/wanda/keyed.hpp b/source/lib/include/wanda/keyed.hpp
index 58f17ad..58f17ad 100644
--- a/source/include/wanda/keyed.hpp
+++ b/source/lib/include/wanda/keyed.hpp
diff --git a/source/include/wanda/logging.hpp b/source/lib/include/wanda/logging.hpp
index b3c1665..b3c1665 100644
--- a/source/include/wanda/logging.hpp
+++ b/source/lib/include/wanda/logging.hpp
diff --git a/source/include/wanda/magic.hpp b/source/lib/include/wanda/magic.hpp
index fcb153e..fcb153e 100644
--- a/source/include/wanda/magic.hpp
+++ b/source/lib/include/wanda/magic.hpp
diff --git a/source/include/wanda/message.hpp b/source/lib/include/wanda/message.hpp
index 866408f..866408f 100644
--- a/source/include/wanda/message.hpp
+++ b/source/lib/include/wanda/message.hpp
diff --git a/source/include/wanda/optional.hpp b/source/lib/include/wanda/optional.hpp
index da3774c..da3774c 100644
--- a/source/include/wanda/optional.hpp
+++ b/source/lib/include/wanda/optional.hpp
diff --git a/source/include/wanda/setting.hpp b/source/lib/include/wanda/setting.hpp
index 1721651..abbd56f 100644
--- a/source/include/wanda/setting.hpp
+++ b/source/lib/include/wanda/setting.hpp
@@ -7,8 +7,8 @@
 #ifndef WANDA_setting_HPP
 #define WANDA_setting_HPP
 
-#include <wanda/deferred_failure.hpp>
-#include <wanda/type_wrapper.hpp>
+#include "wanda/deferred_failure.hpp"
+#include "wanda/type_wrapper.hpp"
 
 #include <gio/gio.h>
 
diff --git a/source/include/wanda/type_wrapper.hpp b/source/lib/include/wanda/type_wrapper.hpp
index 12684cb..12684cb 100644
--- a/source/include/wanda/type_wrapper.hpp
+++ b/source/lib/include/wanda/type_wrapper.hpp
diff --git a/source/include/wanda/wallpaper.hpp b/source/lib/include/wanda/wallpaper.hpp
index 0cad473..0cad473 100644
--- a/source/include/wanda/wallpaper.hpp
+++ b/source/lib/include/wanda/wallpaper.hpp
diff --git a/source/include/wanda/xdg.hpp b/source/lib/include/wanda/xdg.hpp
index bc138fa..833e4a0 100644
--- a/source/include/wanda/xdg.hpp
+++ b/source/lib/include/wanda/xdg.hpp
@@ -7,7 +7,7 @@
 #ifndef WANDA_XDG_HPP
 #define WANDA_XDG_HPP
 
-#include <wanda/environment.hpp>
+#include "wanda/environment.hpp"
 
 #include <cstddef>
 #include <filesystem>
diff --git a/source/src/wanda/command.cpp b/source/lib/src/command.cpp
index 960c52b..83c6b73 100644
--- a/source/src/wanda/command.cpp
+++ b/source/lib/src/command.cpp
@@ -1,4 +1,4 @@
-#include <wanda/command.hpp>
+#include "wanda/command.hpp"
 
 namespace wanda
 {
diff --git a/source/src/wanda/commander.cpp b/source/lib/src/commander.cpp
index 85fc68a..5122b62 100644
--- a/source/src/wanda/commander.cpp
+++ b/source/lib/src/commander.cpp
@@ -1,7 +1,7 @@
-#include <wanda/commander.hpp>
-#include <wanda/logging.hpp>
-#include <wanda/message.hpp>
-#include <wanda/optional.hpp>
+#include "wanda/commander.hpp"
+#include "wanda/logging.hpp"
+#include "wanda/message.hpp"
+#include "wanda/optional.hpp"
 
 #include <spdlog/fmt/ostr.h>
 
diff --git a/source/src/wanda/control_connection.cpp b/source/lib/src/control_connection.cpp
index 40e29f3..ace13d2 100644
--- a/source/src/wanda/control_connection.cpp
+++ b/source/lib/src/control_connection.cpp
@@ -1,4 +1,4 @@
-#include <wanda/control_connection.hpp>
+#include "wanda/control_connection.hpp"
 
 #include <limits>
 
diff --git a/source/src/wanda/control_interface.cpp b/source/lib/src/control_interface.cpp
index c008920..5f4cf26 100644
--- a/source/src/wanda/control_interface.cpp
+++ b/source/lib/src/control_interface.cpp
@@ -1,6 +1,6 @@
-#include <wanda/control_interface.hpp>
-#include <wanda/logging.hpp>
-#include <wanda/optional.hpp>
+#include "wanda/control_interface.hpp"
+#include "wanda/logging.hpp"
+#include "wanda/optional.hpp"
 
 #include <spdlog/fmt/ostr.h>
 
diff --git a/source/src/wanda/environment.cpp b/source/lib/src/environment.cpp
index 533a5f5..2f1af0a 100644
--- a/source/src/wanda/environment.cpp
+++ b/source/lib/src/environment.cpp
@@ -1,4 +1,4 @@
-#include <wanda/environment.hpp>
+#include "wanda/environment.hpp"
 
 #include <string>
 
diff --git a/source/src/wanda/filesystem.cpp b/source/lib/src/filesystem.cpp
index 4da30b1..35b6b40 100644
--- a/source/src/wanda/filesystem.cpp
+++ b/source/lib/src/filesystem.cpp
@@ -1,4 +1,4 @@
-#include <wanda/filesystem.hpp>
+#include "wanda/filesystem.hpp"
 
 #include <random>
 #include <ranges>
diff --git a/source/src/wanda/logging.cpp b/source/lib/src/logging.cpp
index 8c61953..0aa7e40 100644
--- a/source/src/wanda/logging.cpp
+++ b/source/lib/src/logging.cpp
@@ -1,4 +1,4 @@
-#include <wanda/logging.hpp>
+#include "wanda/logging.hpp"
 
 namespace wanda
 {
diff --git a/source/src/wanda/message.cpp b/source/lib/src/message.cpp
index 978b7c4..34930bc 100644
--- a/source/src/wanda/message.cpp
+++ b/source/lib/src/message.cpp
@@ -1,4 +1,4 @@
-#include <wanda/message.hpp>
+#include "wanda/message.hpp"
 
 #include <ios>
 #include <iterator>
diff --git a/source/src/wanda/setting.cpp b/source/lib/src/setting.cpp
index f0cf7a7..b3f661e 100644
--- a/source/src/wanda/setting.cpp
+++ b/source/lib/src/setting.cpp
@@ -1,4 +1,4 @@
-#include <wanda/setting.hpp>
+#include "wanda/setting.hpp"
 
 #include <algorithm>
 #include <type_traits>
diff --git a/source/src/wanda/wallpaper.cpp b/source/lib/src/wallpaper.cpp
index 7d4c7d5..25cb493 100644
--- a/source/src/wanda/wallpaper.cpp
+++ b/source/lib/src/wallpaper.cpp
@@ -1,8 +1,8 @@
-#include <wanda/logging.hpp>
-#include <wanda/magic.hpp>
-#include <wanda/optional.hpp>
-#include <wanda/setting.hpp>
-#include <wanda/wallpaper.hpp>
+#include "wanda/logging.hpp"
+#include "wanda/magic.hpp"
+#include "wanda/optional.hpp"
+#include "wanda/setting.hpp"
+#include "wanda/wallpaper.hpp"
 
 #include <boost/gil.hpp>
 #include <boost/gil/extension/io/jpeg.hpp>
@@ -37,13 +37,6 @@ namespace wanda
       }
 
       return image;
-
-      // // auto source_view = ;
-
-      // return fmt::format("#{:02X}{:02X}{:02X}",
-      //                    static_cast<uint8_t>(std::sqrt((at_c<0>(pixel64) / image.size()))),
-      //                    static_cast<uint8_t>(std::sqrt((at_c<1>(pixel64) / image.size()))),
-      //                    static_cast<uint8_t>(std::sqrt((at_c<2>(pixel64) / image.size()))));
     }
 
     auto average_colors(boost::gil::rgb8_image_t image)
@@ -64,7 +57,6 @@ namespace wanda
       return accumulator;
     }
 
-    //
   }  // namespace
 
   void set_wallpaper(std::filesystem::path wallpaper)
diff --git a/source/src/wanda/xdg.cpp b/source/lib/src/xdg.cpp
index d49e53f..cfd1719 100644
--- a/source/src/wanda/xdg.cpp
+++ b/source/lib/src/xdg.cpp
@@ -1,4 +1,4 @@
-#include <wanda/xdg.hpp>
+#include "wanda/xdg.hpp"
 
 #include <unistd.h>