From 702ee676e629f91973941530c013707b2bfdbfda Mon Sep 17 00:00:00 2001
From: Damien Lacoste <damien.lacoste@esrf.fr>
Date: Mon, 16 Aug 2021 13:34:37 +0200
Subject: [PATCH] Update spdlog to latest 1.9.2 revision, and use the compiled
version of it to build libhdb++-timescale
---
CMakeLists.txt | 6 ++++--
thirdparty/spdlog | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce3c63e..9a2b437 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,6 +107,8 @@ add_subdirectory(thirdparty/google/googletest/googletest EXCLUDE_FROM_ALL)
# Include the thirdparty projects
#add_subdirectory(thirdparty/libpqxx EXCLUDE_FROM_ALL)
add_subdirectory(thirdparty/spdlog EXCLUDE_FROM_ALL)
+set_property(TARGET spdlog PROPERTY POSITION_INDEPENDENT_CODE ON)
+
add_subdirectory(thirdparty/Catch2 EXCLUDE_FROM_ALL)
# Find the libpqxx package
@@ -185,7 +187,7 @@ add_library(${BACKEND_TARGET_SHARED} SHARED ${SRC_FILES})
target_link_libraries(${BACKEND_TARGET_SHARED}
PUBLIC libhdbpp::libhdbpp_headers
- PRIVATE Threads::Threads pqxx_static spdlog::spdlog_header_only TangoInterfaceLibrary)
+ PRIVATE Threads::Threads pqxx_static spdlog::spdlog TangoInterfaceLibrary)
target_include_directories(${BACKEND_TARGET_SHARED}
PUBLIC
@@ -219,7 +221,7 @@ add_library(${BACKEND_TARGET_STATIC} STATIC EXCLUDE_FROM_ALL ${SRC_FILES})
target_link_libraries(${BACKEND_TARGET_STATIC}
INTERFACE libhdbpp::libhdbpp_headers
- PUBLIC pqxx_static spdlog Threads::Threads
+ PUBLIC pqxx_static spdlog::spdlog Threads::Threads
PRIVATE TangoInterfaceLibrary)
target_include_directories(${BACKEND_TARGET_STATIC}
diff --git a/thirdparty/spdlog b/thirdparty/spdlog
index 1549ff1..eb32206 160000
--- a/thirdparty/spdlog
+++ b/thirdparty/spdlog
@@ -1 +1 @@
-Subproject commit 1549ff12f1aa61ffc4d9a8727c519034724392a0
+Subproject commit eb3220622e73a4889eee355ffa37972b3cac3df5
--
GitLab