From 2fb05aa12da80b8fa031464ea21206d61bc8c125 Mon Sep 17 00:00:00 2001
From: Alexey Stratulat <alexey.stratulat@demlabs.net>
Date: Fri, 30 Aug 2019 22:47:56 +0700
Subject: [PATCH] [*] Edited the Cmake file, removed the addition under the
libdap-crypto directory.
---
CMakeLists.txt | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57224553..70031306 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,10 +4,16 @@ 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))
+ if (NOT (TARGET dap_core))
+ add_subdirectory(libdap)
+ target_compile_options(
+ dap_core PRIVATE
+ "-fpic"
+ )
+ endif()
+endif()
file(GLOB CORE_SRCS src/*.c)
file(GLOB CORE_HEADERS src/*.h)
@@ -27,7 +33,7 @@ target_compile_options(
"-fpic"
)
-target_link_libraries(${PROJECT_NAME} dap_core dap_crypto)
+target_link_libraries(${PROJECT_NAME} dap_core)
target_include_directories(${PROJECT_NAME} PUBLIC src/ )
--
GitLab