From b27ac74313e252cb54d852eb84a3f3c4fa441bfc Mon Sep 17 00:00:00 2001 From: mordred Date: Fri, 26 Oct 2018 14:45:10 +0200 Subject: [PATCH] Hopefully last CI fix attempt --- cmake/compiler.cmake | 1 + src/servers/sapphire_api/CMakeLists.txt | 6 ++++-- src/servers/sapphire_lobby/CMakeLists.txt | 10 +++++++--- src/servers/sapphire_zone/CMakeLists.txt | 3 ++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake index 06487051..c640e4bc 100644 --- a/cmake/compiler.cmake +++ b/cmake/compiler.cmake @@ -5,6 +5,7 @@ if(UNIX) else() add_definitions(-D_WIN32_WINNT=0x601) add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-DNOMINMAX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHc") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") diff --git a/src/servers/sapphire_api/CMakeLists.txt b/src/servers/sapphire_api/CMakeLists.txt index 22a2a294..09a587ff 100644 --- a/src/servers/sapphire_api/CMakeLists.txt +++ b/src/servers/sapphire_api/CMakeLists.txt @@ -18,5 +18,7 @@ set_target_properties(sapphire_api PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" ) -target_link_libraries (sapphire_api common stdc++fs) - +target_link_libraries( sapphire_api common ) +if( UNIX ) + target_link_libraries( sapphire_api stdc++fs ) +endif() diff --git a/src/servers/sapphire_lobby/CMakeLists.txt b/src/servers/sapphire_lobby/CMakeLists.txt index 2164c586..632a1151 100644 --- a/src/servers/sapphire_lobby/CMakeLists.txt +++ b/src/servers/sapphire_lobby/CMakeLists.txt @@ -19,10 +19,14 @@ set_target_properties( sapphire_lobby RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" ) - target_link_libraries( sapphire_lobby PRIVATE - common - stdc++fs ) + common ) +if( UNIX ) + target_link_libraries( sapphire_lobby + PRIVATE + stdc++fs ) + +endif() #cotire( sapphire_lobby ) diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt index 895490ce..91abd05d 100644 --- a/src/servers/sapphire_zone/CMakeLists.txt +++ b/src/servers/sapphire_zone/CMakeLists.txt @@ -35,11 +35,12 @@ set_target_properties(sapphire_zone PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/" ) -target_link_libraries( sapphire_zone PUBLIC common stdc++fs ) +target_link_libraries( sapphire_zone PUBLIC common ) target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" ) if (UNIX) # cotire( sapphire_zone ) + target_link_libraries( sapphire_zone PUBLIC stdc++fs ) endif()