diff --git a/CMakeLists.txt b/CMakeLists.txt index ce3c63e7f1032012ecfa77da857df9003b3396b6..9a2b437e42fe2ea4001a25ffb21f5ba4361c1e18 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 1549ff12f1aa61ffc4d9a8727c519034724392a0..eb3220622e73a4889eee355ffa37972b3cac3df5 160000 --- a/thirdparty/spdlog +++ b/thirdparty/spdlog @@ -1 +1 @@ -Subproject commit 1549ff12f1aa61ffc4d9a8727c519034724392a0 +Subproject commit eb3220622e73a4889eee355ffa37972b3cac3df5