From ab8bebe0569769df461c43e02b3851db3f2fc696 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 5 Sep 2023 13:13:29 +0200 Subject: deps: switch spdlog to header-only variant --- conanfile.py | 3 +++ source/app/CMakeLists.txt | 4 ++-- source/lib/control/CMakeLists.txt | 4 ++-- source/lib/system/CMakeLists.txt | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index 8926d87..bd1aa84 100644 --- a/conanfile.py +++ b/conanfile.py @@ -42,6 +42,9 @@ class Wanda(ConanFile): cmake.configure() cmake.build() + def configure(self): + self.options["spdlog"].header_only = True + def generate(self): toolchain = CMakeToolchain(self) toolchain.variables["CMAKE_EXPORT_COMPILE_COMMANDS"] = True diff --git a/source/app/CMakeLists.txt b/source/app/CMakeLists.txt index 7fd46c2..a567dd1 100644 --- a/source/app/CMakeLists.txt +++ b/source/app/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries("${PROJECT_NAME}c" PRIVATE "asio::asio" "bfg::lyra" - "spdlog::spdlog" + "spdlog::spdlog_header_only" ) set_target_properties("wandac" PROPERTIES @@ -44,7 +44,7 @@ target_link_libraries("wandad" PRIVATE "asio::asio" "bfg::lyra" - "spdlog::spdlog" + "spdlog::spdlog_header_only" ) set_target_properties("wandad" PROPERTIES diff --git a/source/lib/control/CMakeLists.txt b/source/lib/control/CMakeLists.txt index 3236cf8..6e95456 100644 --- a/source/lib/control/CMakeLists.txt +++ b/source/lib/control/CMakeLists.txt @@ -34,11 +34,11 @@ target_link_libraries("wanda-${LIB_NAME}" PUBLIC "wanda::system" "asio::asio" - "spdlog::spdlog" + "spdlog::spdlog_header_only" ) install(TARGETS "wanda-${LIB_NAME}" FILE_SET HEADERS ) -add_library("wanda::${LIB_NAME}" ALIAS "wanda-${LIB_NAME}") \ No newline at end of file +add_library("wanda::${LIB_NAME}" ALIAS "wanda-${LIB_NAME}") diff --git a/source/lib/system/CMakeLists.txt b/source/lib/system/CMakeLists.txt index a3b5ecd..ecfa2c3 100644 --- a/source/lib/system/CMakeLists.txt +++ b/source/lib/system/CMakeLists.txt @@ -55,7 +55,7 @@ target_link_libraries("wanda-${LIB_NAME}" PUBLIC "fmt::fmt" "JPEG::JPEG" "PNG::PNG" - "spdlog::spdlog" + "spdlog::spdlog_header_only" "PkgConfig::libmagic" "PkgConfig::GIO" -- cgit v1.2.3