From 157d0772fea0c53177b775f2447ecb195dffae28 Mon Sep 17 00:00:00 2001 From: armatusmiles <akurotych@gmail.com> Date: Tue, 22 Jan 2019 15:39:59 +0700 Subject: [PATCH] [*] Fix build errors --- CMakeLists.txt | 5 +++-- libdap-server | 2 +- libdap-server-core | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49d6a9d..63f6aa3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,13 +3,14 @@ project (dap_client) set(CMAKE_C_STANDARD 11) -if(BUILD_LIB_DAP_CLIENT_TESTS) - enable_testing() +if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON)) add_subdirectory(libdap) + add_subdirectory(libdap-server-core) add_subdirectory(libdap-server) add_subdirectory(libdap-stream) add_subdirectory(libdap-stream-ch) + enable_testing() add_subdirectory(test) endif() diff --git a/libdap-server b/libdap-server index 9bd34bf..b9e00d6 160000 --- a/libdap-server +++ b/libdap-server @@ -1 +1 @@ -Subproject commit 9bd34bfe22d43d0b9244d033d6ab0c67552412cc +Subproject commit b9e00d688081526e165a1b72b46640dc333fbcb1 diff --git a/libdap-server-core b/libdap-server-core index a6d3208..edf554c 160000 --- a/libdap-server-core +++ b/libdap-server-core @@ -1 +1 @@ -Subproject commit a6d3208969d258a05c1d5435c22869a95ee93fd8 +Subproject commit edf554c77e05146aee6a90a6a15fab28ba38b626 -- GitLab