From 82eccf3355684393062b899ef1d45402aa9d41e9 Mon Sep 17 00:00:00 2001 From: kali Date: Sat, 2 Nov 2024 09:39:22 -0400 Subject: [PATCH] minor --- libs/libBoostSocketHandler/CMakeLists.txt | 8 ++++- .../src/SocketHandler.cpp | 8 ++++- .../tests/CMakeLists.txt | 31 +++++++++++++++---- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/libs/libBoostSocketHandler/CMakeLists.txt b/libs/libBoostSocketHandler/CMakeLists.txt index 9a76285..132b436 100644 --- a/libs/libBoostSocketHandler/CMakeLists.txt +++ b/libs/libBoostSocketHandler/CMakeLists.txt @@ -12,7 +12,13 @@ src/SocketHandler.cpp include_directories(../src) add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES}) -target_link_libraries(${PROJECT_NAME} boost::boost spdlog::spdlog) + +if(spdlog_FOUND) + target_link_libraries(${PROJECT_NAME} boost::boost spdlog::spdlog) +else() + target_link_libraries(${PROJECT_NAME} boost::boost) +endif() + set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON) target_include_directories(${PROJECT_NAME} PUBLIC src) diff --git a/libs/libBoostSocketHandler/src/SocketHandler.cpp b/libs/libBoostSocketHandler/src/SocketHandler.cpp index 65fe3a2..06218bd 100644 --- a/libs/libBoostSocketHandler/src/SocketHandler.cpp +++ b/libs/libBoostSocketHandler/src/SocketHandler.cpp @@ -2,7 +2,13 @@ #include -#include "spdlog/spdlog.h" +#ifdef spdlog_FOUND + #include "spdlog/spdlog.h" +#else + #define SPDLOG_TRACE(...) (void)0 + #define SPDLOG_DEBUG(...) (void)0 + #define SPDLOG_ERROR(...) (void)0 +#endif using boost::asio::ip::tcp; using namespace SocketHandler; diff --git a/libs/libBoostSocketHandler/tests/CMakeLists.txt b/libs/libBoostSocketHandler/tests/CMakeLists.txt index e7f8c4c..cbab05a 100644 --- a/libs/libBoostSocketHandler/tests/CMakeLists.txt +++ b/libs/libBoostSocketHandler/tests/CMakeLists.txt @@ -1,14 +1,33 @@ add_executable(testClient "testClient.cpp" ) -if(WIN32) - target_link_libraries(testClient SocketHandler boost::boost spdlog::spdlog ) + +if(spdlog_FOUND) + if(WIN32) + target_link_libraries(testClient SocketHandler boost::boost spdlog::spdlog ) + else() + target_link_libraries(testClient SocketHandler boost::boost pthread spdlog::spdlog ) + endif() else() - target_link_libraries(testClient SocketHandler boost::boost pthread spdlog::spdlog ) + if(WIN32) + target_link_libraries(testClient SocketHandler boost::boost ) + else() + target_link_libraries(testClient SocketHandler boost::boost pthread ) + endif() endif() + add_executable(testServer "testServer.cpp" ) -if(WIN32) - target_link_libraries(testServer SocketHandler boost::boost spdlog::spdlog ) + +if(spdlog_FOUND) + if(WIN32) + target_link_libraries(testServer SocketHandler boost::boost spdlog::spdlog ) + else() + target_link_libraries(testServer SocketHandler boost::boost pthread spdlog::spdlog ) + endif() else() - target_link_libraries(testServer SocketHandler boost::boost pthread spdlog::spdlog ) + if(WIN32) + target_link_libraries(testServer SocketHandler boost::boost ) + else() + target_link_libraries(testServer SocketHandler boost::boost pthread ) + endif() endif()