From 5effd64cef3189464c8ac6ccbced63f6644afe62 Mon Sep 17 00:00:00 2001
From: "alexey.stratulat" <alexey.stratulat@demlabs.net>
Date: Fri, 11 Oct 2019 22:54:43 +0700
Subject: [PATCH] [*] Fix. Added check connecting libdap-crypto submodule.
---
CMakeLists.txt | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ca566b3..c5ab0308 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,14 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
"-fpic"
)
endif()
+ if (NOT (TARGET dap_crypto))
+ add_subdirectory(libdap-crypto)
+ target_compile_options(
+ dap_crypto PRIVATE
+ "-fpic"
+ )
+ endif()
endif()
-add_subdirectory(libdap-crypto)
file(GLOB CRYPTO_PYTHON_SRCS src/*.c)
file(GLOB CRYPTO_PYTHON_HEADERS include/*.h)
@@ -29,16 +35,6 @@ add_library(${PROJECT_NAME} STATIC ${CRYPTO_PYTHON_SRCS} ${CRYPTO_PYTHON_HEADERS
target_link_libraries(${PROJECT_NAME})
-target_compile_options(
- dap_core PRIVATE
- "-fpic"
-)
-target_compile_options(
- dap_crypto PRIVATE
- "-fpic"
-)
-
-
target_link_libraries(${PROJECT_NAME} dap_core dap_crypto)
target_include_directories(${PROJECT_NAME} PUBLIC include/ )
--
GitLab