From 3d76f8fe40e00ff9363d485a35bd113d96fc1384 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Mon, 6 Apr 2020 20:10:58 +0700
Subject: [PATCH] [*] Fixes
---
CMakeLists.txt | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51070a53..d5b5f77a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,32 +51,13 @@ target_compile_options(dap_chain_cs_dag_poa PRIVATE "-fpic")
target_compile_options(dap_chain_cs_dag_pos PRIVATE "-fpic")
-add_subdirectory(cellframe-sdk-python/libdap-server-core-python)
-add_subdirectory(cellframe-sdk-python/libdap-python)
-add_subdirectory(cellframe-sdk-python/libdap-crypto-python)
-add_subdirectory(cellframe-sdk-python/libdap-chain-common-python)
-add_subdirectory(cellframe-sdk-python/libdap-chain-net-python)
-add_subdirectory(cellframe-sdk-python/libdap-chain-gdb-python)
-add_subdirectory(cellframe-sdk-python/libdap-chain-python)
-add_subdirectory(cellframe-sdk-python/libdap-app-cli-python)
-add_subdirectory(cellframe-sdk-python/libdap-client-python)
if (SUPPORT_PYTHON_PLUGINS)
add_definitions("-fpic")
- add_subdirectory(cellframe-sdk-python/libdap-chain-common-python)
- add_subdirectory(cellframe-sdk-python/libdap-server-core-python)
- add_subdirectory(cellframe-sdk-python/libdap-python)
- add_subdirectory(cellframe-sdk-python/libdap-crypto-python)
- add_subdirectory(cellframe-sdk-python/libdap-chain-net-python)
- add_subdirectory(cellframe-sdk-python/libdap-chain-gdb-python)
- add_subdirectory(cellframe-sdk-python/libdap-chain-python)
- add_subdirectory(cellframe-sdk-python/libdap-app-cli-python)
- add_subdirectory(cellframe-sdk-python/libdap-client-python)
add_library(${PROJECT_NAME} STATIC ${PYTHON_CELLFRAME_SRCS} ${PYTHON_CELLFRAME_HEADERS})
-
else()
SET( CPACK_GENERATOR "DEB")
@@ -91,6 +72,15 @@ else()
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}\"")
set(SUBMODULES_NO_BUILD ON)
+ add_subdirectory(cellframe-sdk-python/libdap-chain-common-python)
+ add_subdirectory(cellframe-sdk-python/libdap-server-core-python)
+ add_subdirectory(cellframe-sdk-python/libdap-python)
+ add_subdirectory(cellframe-sdk-python/libdap-crypto-python)
+ add_subdirectory(cellframe-sdk-python/libdap-chain-net-python)
+ add_subdirectory(cellframe-sdk-python/libdap-chain-gdb-python)
+ add_subdirectory(cellframe-sdk-python/libdap-chain-python)
+ add_subdirectory(cellframe-sdk-python/libdap-app-cli-python)
+ add_subdirectory(cellframe-sdk-python/libdap-client-python)
target_compile_options(dap_chain_common_python_module PRIVATE "-fpic")
--
GitLab