From 3e7e0d8eb01e53b2b35cba30bea90320e3e0f43e Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <naeper@demlabs.net>
Date: Wed, 5 Jun 2019 14:36:08 +0700
Subject: [PATCH] [*] Fixed unit tests
---
CMakeLists.txt | 28 ++++++++++++++++++++++------
enc_server/CMakeLists.txt | 2 +-
http_server/CMakeLists.txt | 2 +-
libdap-server-core | 2 +-
libdap-server-udp | 2 +-
test/enc_server/CMakeLists.txt | 2 +-
6 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3245416..15393c8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,16 +2,32 @@ project(libdap-server C)
cmake_minimum_required(VERSION 3.0)
if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
- add_subdirectory(libdap)
- add_subdirectory(libdap-crypto)
- add_subdirectory(libdap-server-core)
-# add_subdirectory(libdap-server-udp)
- enable_testing()
- add_subdirectory(test)
+ if ( NOT ( TARGET dap_core ) )
+ add_subdirectory(libdap)
+ endif()
+
+ if ( NOT ( TARGET dap_crypto ) )
+ add_subdirectory(libdap-crypto)
+ endif()
+
+ if ( NOT ( TARGET dap_server_core ) )
+ add_subdirectory(libdap-server-core)
+ endif()
+
+# if ( NOT ( TARGET dap_server_udp ) )
+# add_subdirectory(libdap-server-udp)
+# endif()
+
endif()
+
find_package(PkgConfig)
pkg_check_modules(PC_JSON-C REQUIRED json-c)
add_subdirectory(http_server)
add_subdirectory(enc_server)
+
+if (BUILD_LIB_DAP_SERVER_TESTS)
+ enable_testing()
+ add_subdirectory(test)
+endif()
diff --git a/enc_server/CMakeLists.txt b/enc_server/CMakeLists.txt
index a8ee4ee..7cb4649 100755
--- a/enc_server/CMakeLists.txt
+++ b/enc_server/CMakeLists.txt
@@ -6,6 +6,6 @@ set(DAP_ENC_SERVER_SRCS dap_enc_http.c dap_enc_ks.c)
add_library(${PROJECT_NAME} STATIC ${DAP_ENC_SERVER_SRCS})
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto
- dap_core_server dap_http_server json-c)
+ dap_server_core dap_http_server json-c)
target_include_directories(dap_enc_server INTERFACE .)
diff --git a/http_server/CMakeLists.txt b/http_server/CMakeLists.txt
index 38558a3..0a548ba 100755
--- a/http_server/CMakeLists.txt
+++ b/http_server/CMakeLists.txt
@@ -16,5 +16,5 @@ add_library(${PROJECT_NAME} STATIC ${HTTP_SERVER_SRCS})
target_include_directories(dap_http_server INTERFACE . http_client)
-target_link_libraries(dap_http_server dap_core dap_crypto dap_core_server magic curl json-c)
+target_link_libraries(dap_http_server dap_core dap_crypto dap_server_core magic curl json-c)
diff --git a/libdap-server-core b/libdap-server-core
index 8db5287..1008394 160000
--- a/libdap-server-core
+++ b/libdap-server-core
@@ -1 +1 @@
-Subproject commit 8db5287183350877e1b002603d121b69cffe0964
+Subproject commit 1008394f0ecdbc41d995a4cc5bbc4b51ad789eaf
diff --git a/libdap-server-udp b/libdap-server-udp
index 2a07586..4a1ea0e 160000
--- a/libdap-server-udp
+++ b/libdap-server-udp
@@ -1 +1 @@
-Subproject commit 2a075869bf2e4a00e98af0f1178d7cd2efcae0cb
+Subproject commit 4a1ea0e1a8936d8ca74a2d8cc9658bcee38e0e26
diff --git a/test/enc_server/CMakeLists.txt b/test/enc_server/CMakeLists.txt
index 44b0e1e..3fd0ab3 100755
--- a/test/enc_server/CMakeLists.txt
+++ b/test/enc_server/CMakeLists.txt
@@ -6,7 +6,7 @@ file(GLOB SRC *.h *.c)
add_executable(${PROJECT_NAME} ${SRC})
-target_link_libraries(${PROJECT_NAME} dap_test dap_core)
+target_link_libraries(${PROJECT_NAME} dap_test dap_core dap_enc_server)
add_test(
NAME ${PROJECT_NAME}
--
GitLab