From 9e7533d55957ae9c141d88058de8ba85879037b6 Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Fri, 8 Nov 2019 08:39:17 +0300
Subject: [PATCH] Windows build fixed
---
enc_server/CMakeLists.txt | 3 +--
http_server/CMakeLists.txt | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/enc_server/CMakeLists.txt b/enc_server/CMakeLists.txt
index d358c26..6c6cce0 100755
--- a/enc_server/CMakeLists.txt
+++ b/enc_server/CMakeLists.txt
@@ -21,7 +21,6 @@ if(WIN32)
include_directories(../../3rdparty/wepoll/include/)
include_directories(../../3rdparty/uthash/src/)
include_directories(../../3rdparty/libjson-c/)
- include_directories(../../3rdparty/libmagic/src/)
include_directories(../../3rdparty/curl/include/)
endif()
@@ -31,7 +30,7 @@ if(WIN32)
target_link_libraries(dap_enc_server dap_core dap_crypto dap_server_core dap_http_server
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmemcached[x86_64CLANG].a
- ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
+ #${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/curl[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a
KERNEL32
diff --git a/http_server/CMakeLists.txt b/http_server/CMakeLists.txt
index 9fbe44a..b8f0b44 100755
--- a/http_server/CMakeLists.txt
+++ b/http_server/CMakeLists.txt
@@ -30,7 +30,6 @@ if(WIN32)
include_directories(../../3rdparty/wepoll/include/)
include_directories(../../3rdparty/uthash/src/)
include_directories(../../3rdparty/libjson-c/)
- include_directories(../../3rdparty/libmagic/src/)
include_directories(../../3rdparty/curl/include/)
endif()
@@ -39,10 +38,10 @@ add_library(${PROJECT_NAME} STATIC ${HTTP_SERVER_SRCS})
target_include_directories(dap_http_server INTERFACE . http_client)
if(WIN32)
- target_link_libraries(dap_http_server dap_core dap_crypto dap_server_core
+ target_link_libraries(dap_http_server dap_core dap_crypto dap_server_core magic regex tre intl iconv
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmemcached[x86_64CLANG].a
- ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
+ #${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/curl[x86_64CLANG].a
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/wepoll[x86_64CLANG].a
KERNEL32
--
GitLab