From 2e0519f392d2b7d77838f3ab466c0cbff474d3c0 Mon Sep 17 00:00:00 2001
From: "alexey.stratulat" <alexey.stratulat@demlabs.net>
Date: Wed, 20 Nov 2019 22:20:48 +0700
Subject: [PATCH] [+] Before connecting libdap-server-core submodule, a check
was added to determine whether this submodule needs to be connected.
---
CMakeLists.txt | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d023c506..618595e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,9 +22,15 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
"-fpic"
)
endif()
+ if (NOT (TARGET dap-server-core))
+ add_subdirectory(libdap-server-core)
+ target_compile_options(
+ dap_server_core PRIVATE
+ "-fpic"
+ )
+ endif()
endif()
-add_subdirectory(libdap-server-core)
file(GLOB SERVER_CORE_PYTHON_SRCS src/*.c)
@@ -38,10 +44,6 @@ add_library(${PROJECT_NAME} STATIC ${SERVER_CORE_PYTHON_SRCS} ${SERVER_CORE_PYTH
target_link_libraries(${PROJECT_NAME})
-target_compile_options(
- dap_server_core PRIVATE
- "-fpic"
-)
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core)
--
GitLab