From f3acd9386e8ba2f11ca7e70b348d85b7a0782bbb Mon Sep 17 00:00:00 2001 From: Minho Kang Date: Fri, 1 Sep 2017 18:38:34 +0900 Subject: [PATCH] Link libsodium for VS2015 --- src/servers/Server_REST/CMakeLists.txt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/servers/Server_REST/CMakeLists.txt b/src/servers/Server_REST/CMakeLists.txt index f49d6903..f3a4e262 100644 --- a/src/servers/Server_REST/CMakeLists.txt +++ b/src/servers/Server_REST/CMakeLists.txt @@ -68,15 +68,30 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 4) # 32 bit link link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x86) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x86) - link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/Win32/Release/v141/static) else() # 64 bit link link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/MySQL/x64) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/zlib/x64) - link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/x64/Release/v141/static) endif() +# Link libsodium +if(NOT UNIX) + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + if (MSVC_VERSION EQUAL 1900) # Visual Studio 2015 + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/Win32/Release/v140/static) + else() + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/Win32/Release/v141/static) + endif() + else() + if (MSVC_VERSION EQUAL 1900) # Visual Studio 2015 + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/x64/Release/v140/static) + else() + link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/x64/Release/v141/static) + endif() + endif() +endif() + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/") add_executable(server_rest ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) add_dependencies(server_rest Common xivdat)