diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49d6a9d6abca16a4a37f5350a764ca4c2b4fd6de..63f6aa394d271483664e2a19a76dba9ce857028f 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 9bd34bfe22d43d0b9244d033d6ab0c67552412cc..b9e00d688081526e165a1b72b46640dc333fbcb1 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 a6d3208969d258a05c1d5435c22869a95ee93fd8..edf554c77e05146aee6a90a6a15fab28ba38b626 160000
--- a/libdap-server-core
+++ b/libdap-server-core
@@ -1 +1 @@
-Subproject commit a6d3208969d258a05c1d5435c22869a95ee93fd8
+Subproject commit edf554c77e05146aee6a90a6a15fab28ba38b626