From c2db122d1c0cd62d862692443172ca11b7495401 Mon Sep 17 00:00:00 2001
From: Alexey Stratulat <alexey.stratulat@demlabs.net>
Date: Sun, 25 Aug 2019 23:23:50 +0700
Subject: [PATCH] [*] Fix. The Cmake file has been changed so that linked
libraries are taken into account earlier (from the parent Cmake file).
---
CMakeLists.txt | 34 +++++++++++++++++++---------------
1 file changed, 19 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31c5bfe7..fcddb20d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,12 +4,28 @@ cmake_minimum_required(VERSION 2.8)
set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_C_STANDARD 11)
-set(SUBMODULES_NO_BUILD ON)
-add_subdirectory(libdap)
-add_subdirectory(libdap-crypto)
+if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
+ set(SUBMODULES_NO_BUILD ON)
+ if (NOT (TARGET dap_core))
+ add_subdirectory(libdap)
+ target_compile_options(
+ dap_core PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET dap_crypto))
+ add_subdirectory(libdap-crypto)
+ target_compile_options(
+ dap_crypto PRIVATE
+ "-fpic"
+ )
+ endif()
+endif()
+
add_subdirectory(libdap-server-core)
+
file(GLOB SERVER_CORE_PYTHON_SRCS src/*.c)
file(GLOB SERVER_CORE_PYTHON_HEADERS include/*.h)
@@ -28,18 +44,6 @@ target_compile_options(
"-fpic"
)
-target_compile_options(
- dap_core PRIVATE
- "-fpic"
-)
-target_compile_options(
- dap_crypto PRIVATE
- "-fpic"
-)
-
-
-#target_link_libraries(${PROJECT_NAME} dap_core dap_crypto)
-#targat_link_libraries(${PROJECT_NAME} dap_server_core)
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_server_core)
#if(BUILD_DAP_PYTHON_TESTS)
--
GitLab