From 683f6822efa7e999fc0965f8a6da265dfe99d120 Mon Sep 17 00:00:00 2001
From: "alexey.stratulat" <alexey.stratulat@demlabs.net>
Date: Wed, 11 Dec 2019 22:33:33 +0700
Subject: [PATCH] [+] Added submodule libdap-python
---
.gitmodules | 3 +++
CMakeLists.txt | 23 ++++++++++++++++++++++-
libdap-python | 1 +
3 files changed, 26 insertions(+), 1 deletion(-)
create mode 160000 libdap-python
diff --git a/.gitmodules b/.gitmodules
index db41a3c9..be43aa5b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -79,3 +79,6 @@
[submodule "libdap-chain-common"]
path = libdap-chain-common
url = https://gitlab.demlabs.net/cellframe/libdap-chain-common.git
+[submodule "libdap-python"]
+ path = libdap-python
+ url = https://gitlab.demlabs.net/cellframe/libdap-python.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6a99dfe..0f8671ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,6 +168,27 @@ if (NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
"-fpic"
)
endif()
+ if (NOT (TARGET (dap_python_module)))
+ add_subdirectory(libdap-python)
+ target_compile_options(
+ dap_python_module PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET (dap_chain_python_module)))
+ add_subdirectory(libdap-chain-python)
+ target_compile_options(
+ dap_chain_python_module PRIVATE
+ "-fpic"
+ )
+ endif()
+ if (NOT (TARGET (dap_crypto_python_module)))
+ add_subdirectory(libdap-crypto-python)
+ target_compile_options(
+ dap_crypto_python_module PRIVATE
+ "-fpic"
+ )
+ endif()
endif()
@@ -182,7 +203,7 @@ add_library(${PROJECT_NAME} STATIC ${CHAIN_GDB_PYTHON_SRCS} ${CHAIN_GDB_PYTHON_H
target_link_libraries(${PROJECT_NAME})
-target_link_libraries(${PROJECT_NAME} dap_chain_gdb dap_core dap_chain dap_chain_global_db dap_chain_mempool dap_chain_net)
+target_link_libraries(${PROJECT_NAME} dap_chain_gdb dap_core dap_chain dap_chain_global_db dap_chain_mempool dap_chain_net dap_chain_python_module)
target_include_directories(${PROJECT_NAME} PUBLIC include/ )
diff --git a/libdap-python b/libdap-python
new file mode 160000
index 00000000..4a15aca6
--- /dev/null
+++ b/libdap-python
@@ -0,0 +1 @@
+Subproject commit 4a15aca686aa56313f8ef8157c7d0aba7c9d7154
--
GitLab