From 0ac9d0cc2efc0eb2ec26e86435ae98c1cc687997 Mon Sep 17 00:00:00 2001 From: Cekis Date: Sat, 27 Nov 2021 15:19:53 -0500 Subject: [PATCH] Putting back the changes in light of adjustments to src --- src/stationapi/CMakeLists.txt | 34 +++++++++++++++++----------------- src/stationchat/CMakeLists.txt | 1 - 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/stationapi/CMakeLists.txt b/src/stationapi/CMakeLists.txt index 9503000..b04caea 100644 --- a/src/stationapi/CMakeLists.txt +++ b/src/stationapi/CMakeLists.txt @@ -1,19 +1,19 @@ +add_library( + stationapi + Node.hpp + NodeClient.cpp + NodeClient.hpp + Serialization.hpp + SQLite3.hpp + StreamUtils.cpp + StreamUtils.hpp + StringUtils.cpp + StringUtils.hpp) -add_library(stationapi - Node.hpp - NodeClient.cpp - NodeClient.hpp - Serialization.hpp - SQLite3.hpp - StreamUtils.cpp - StreamUtils.hpp - StringUtils.cpp - StringUtils.hpp) +target_include_directories( + stationapi + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/externals/catch + ${PROJECT_SOURCE_DIR}/externals/easyloggingpp ${Boost_INCLUDE_DIRS} + ${SQLite3_INCLUDE_DIR}) -target_include_directories(stationapi PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${PROJECT_SOURCE_DIR}/externals/catch - ${PROJECT_SOURCE_DIR}/externals/easyloggingpp - ${PROJECT_SOURCE_DIR}/externals/udplibrary - ${Boost_INCLUDE_DIRS} - ${SQLite3_INCLUDE_DIR}) \ No newline at end of file +target_link_libraries(stationapi udplibrary) diff --git a/src/stationchat/CMakeLists.txt b/src/stationchat/CMakeLists.txt index c2796dc..e594d09 100644 --- a/src/stationchat/CMakeLists.txt +++ b/src/stationchat/CMakeLists.txt @@ -65,7 +65,6 @@ add_executable( # cmake-format: off target_link_libraries(stationchat stationapi - udplibrary ${Boost_LIBRARIES} ${SQLite3_LIBRARY} $<$:ws2_32>)