From a4914b903a53e85b67a8c85649842cf1a384da59 Mon Sep 17 00:00:00 2001 From: Minho Kang Date: Fri, 1 Sep 2017 15:40:33 +0900 Subject: [PATCH] Link to Win32 directory for x86 --- src/servers/Server_REST/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/servers/Server_REST/CMakeLists.txt b/src/servers/Server_REST/CMakeLists.txt index f1aa42f7..eb2722fb 100644 --- a/src/servers/Server_REST/CMakeLists.txt +++ b/src/servers/Server_REST/CMakeLists.txt @@ -63,17 +63,18 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodi link_directories(${BOOST_LIBRARYDIR}) link_directories(${SERVER_COMMON_DIR}) link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/sapphire/datReader) -link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external/libsodium/x64/Release/v141/static) - 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() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../../bin/")