From 04d572f05f38d2fbbfcf1f1fe04340396e825e7f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 24 Sep 2018 09:24:08 -0400 Subject: [PATCH] Attempted build fix --- src/common/CMakeLists.txt | 6 ++++-- src/servers/sapphire_api/CMakeLists.txt | 7 +------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index a87b1ac1..15ff5104 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -29,11 +29,13 @@ set_target_properties( common PROPERTIES ) target_link_libraries( common PUBLIC ${Boost_LIBRARIES} ) target_link_libraries( common PUBLIC xivdat ) + target_link_libraries( common PUBLIC mysqlConnector ) - if( UNIX ) + target_link_libraries( common PUBLIC mysqlclient ) target_link_libraries( common PUBLIC pthread ) - +else() + target_link_libraries( common PUBLIC libmysql ) endif() target_include_directories( common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/" ) diff --git a/src/servers/sapphire_api/CMakeLists.txt b/src/servers/sapphire_api/CMakeLists.txt index 429077df..2f83716a 100644 --- a/src/servers/sapphire_api/CMakeLists.txt +++ b/src/servers/sapphire_api/CMakeLists.txt @@ -18,10 +18,5 @@ set_target_properties(sapphire_api PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" ) -if (UNIX) - target_link_libraries (sapphire_api common pthread dl z) -else() - target_link_libraries (sapphire_api common zlib1) -endif() +target_link_libraries (sapphire_api common) -target_link_libraries( sapphire_api ${Boost_LIBRARIES} ${Boost_LIBRARIES} )