From be1c15db7b5ee333cccd69a872ffb8d742fc9585 Mon Sep 17 00:00:00 2001
From: dpuzyrkov <dpuzyrkov@termt.com>
Date: Tue, 24 May 2022 23:05:10 +0300
Subject: [PATCH] [*] link with python by PYTHON_LIBRARY and PYTHON_INCLUDE_DIR
---
CMakeLists.txt | 8 ++------
dists/examples/standalone/CMakeLists.txt | 6 +++---
modules/cellframe-sdk/app-cli/CMakeLists.txt | 2 +-
modules/cellframe-sdk/chain/CMakeLists.txt | 2 +-
modules/cellframe-sdk/common/CMakeLists.txt | 2 +-
modules/cellframe-sdk/consensus/dag_poa/CMakeLists.txt | 2 +-
modules/cellframe-sdk/gdb/CMakeLists.txt | 2 +-
modules/cellframe-sdk/global-db/CMakeLists.txt | 2 +-
modules/cellframe-sdk/mempool/CMakeLists.txt | 2 +-
modules/cellframe-sdk/net/CMakeLists.txt | 2 +-
modules/cellframe-sdk/net/srv/CMakeLists.txt | 2 +-
modules/cellframe-sdk/type/blocks/CMakeLists.txt | 2 +-
modules/cellframe-sdk/type/dag/CMakeLists.txt | 2 +-
modules/cellframe-sdk/wallet/CMakeLists.txt | 2 +-
modules/dap-sdk/core/CMakeLists.txt | 2 +-
modules/dap-sdk/core/test/CMakeLists.txt | 2 +-
modules/dap-sdk/crypto/CMakeLists.txt | 2 +-
modules/dap-sdk/crypto/test/CMakeLists.txt | 2 +-
modules/dap-sdk/net/client/CMakeLists.txt | 2 +-
modules/dap-sdk/net/core/CMakeLists.txt | 2 +-
modules/dap-sdk/net/server/enc/CMakeLists.txt | 2 +-
modules/dap-sdk/net/server/http/CMakeLists.txt | 2 +-
modules/dap-sdk/net/server/json_rpc/CMakeLists.txt | 2 +-
modules/dap-sdk/net/stream/stream/CMakeLists.txt | 2 +-
modules/plugins/CMakeLists.txt | 2 +-
25 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 440fb987..d0f6cb84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,16 +20,12 @@ if (SUPPORT_PYTHON_PLUGINS)
modules/plugins/include/dap_plugins_python_app_context.h)
add_definitions("-fpic")
+
add_definitions("-DDAP_SUPPORT_PYTHON_PLUGINS")
add_library(${PROJECT_NAME} STATIC ${PYTHON_CELLFRAME_SRCS} ${APP_CONTEXT_HEADER} ${PYTHON_CELLFRAME_HEADERS})
target_include_directories(${PROJECT_NAME} INTERFACE include/)
- #add_dependencies(${PROJECT_NAME} ${libpython_static})
-
-
- include_directories(${PYTHON_INCLUDE_PATH})
-
-
+ include_directories(${PYTHON_INCLUDE_DIR})
else()
SET( CPACK_GENERATOR "DEB")
diff --git a/dists/examples/standalone/CMakeLists.txt b/dists/examples/standalone/CMakeLists.txt
index 7622fde8..1cb559f2 100644
--- a/dists/examples/standalone/CMakeLists.txt
+++ b/dists/examples/standalone/CMakeLists.txt
@@ -30,12 +30,12 @@ endif()
message(STATUS "PYTHON_LIBRARIES = ${PYTHON_LIBRARIES}")
message(STATUS "PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}")
-message(STATUS "PYTHON_INCLUDE_DIRS = ${PYTHON_INCLUDE_DIRS}")
+message(STATUS "PYTHON_INCLUDE_DIR = ${PYTHON_INCLUDE_DIR}")
message(STATUS "Boost_LIBRARIES = ${Boost_LIBRARIES}")
ENABLE_TESTING()
-INCLUDE_DIRECTORIES(${CellFrame_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
-LINK_LIBRARIES(${CellFrame_LIBRARIES} ${PYTHON_LIBRARIES}) # Deprecated but so convenient!
+INCLUDE_DIRECTORIES(${CellFrame_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIR})
+#LINK_LIBRARIES(${CellFrame_LIBRARIES} ${PYTHON_LIBRARY}) # Deprecated but so convenient!
ADD_SUBDIRECTORY(0.Beginning
ADD_SUBDIRECTORY(1.Stock)
diff --git a/modules/cellframe-sdk/app-cli/CMakeLists.txt b/modules/cellframe-sdk/app-cli/CMakeLists.txt
index 082361f7..550af193 100644
--- a/modules/cellframe-sdk/app-cli/CMakeLists.txt
+++ b/modules/cellframe-sdk/app-cli/CMakeLists.txt
@@ -21,7 +21,7 @@ endif()
file(GLOB APP_CLI_PYTHON_SRCS src/*.c)
file(GLOB APP_CLI_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${APP_CLI_PYTHON_SRCS} ${APP_CLI_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/chain/CMakeLists.txt b/modules/cellframe-sdk/chain/CMakeLists.txt
index 468535e3..bf4b258c 100644
--- a/modules/cellframe-sdk/chain/CMakeLists.txt
+++ b/modules/cellframe-sdk/chain/CMakeLists.txt
@@ -194,7 +194,7 @@ endif()
file(GLOB CHAIN_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_PYTHON_SRCS} ${CHAIN_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/common/CMakeLists.txt b/modules/cellframe-sdk/common/CMakeLists.txt
index a88e4725..3908e850 100644
--- a/modules/cellframe-sdk/common/CMakeLists.txt
+++ b/modules/cellframe-sdk/common/CMakeLists.txt
@@ -200,7 +200,7 @@ endif()
file(GLOB CHAIN_COMMON_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_COMMON_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_COMMON_PYTHON_SRCS} ${CHAIN_COMMON_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/consensus/dag_poa/CMakeLists.txt b/modules/cellframe-sdk/consensus/dag_poa/CMakeLists.txt
index e2ff1e36..67c44292 100644
--- a/modules/cellframe-sdk/consensus/dag_poa/CMakeLists.txt
+++ b/modules/cellframe-sdk/consensus/dag_poa/CMakeLists.txt
@@ -200,7 +200,7 @@ endif()
file(GLOB CHAIN_COMMON_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_COMMON_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_COMMON_PYTHON_SRCS} ${CHAIN_COMMON_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/gdb/CMakeLists.txt b/modules/cellframe-sdk/gdb/CMakeLists.txt
index 86ddd443..2c390637 100644
--- a/modules/cellframe-sdk/gdb/CMakeLists.txt
+++ b/modules/cellframe-sdk/gdb/CMakeLists.txt
@@ -199,7 +199,7 @@ endif()
file(GLOB CHAIN_GDB_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_GDB_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_GDB_PYTHON_SRCS} ${CHAIN_GDB_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/global-db/CMakeLists.txt b/modules/cellframe-sdk/global-db/CMakeLists.txt
index cb176f76..877c2873 100644
--- a/modules/cellframe-sdk/global-db/CMakeLists.txt
+++ b/modules/cellframe-sdk/global-db/CMakeLists.txt
@@ -181,7 +181,7 @@ endif()
file(GLOB CHAIN_GLOBAL_DB_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_GLOBAL_DB_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_GLOBAL_DB_PYTHON_SRCS} ${CHAIN_GLOBAL_DB_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/mempool/CMakeLists.txt b/modules/cellframe-sdk/mempool/CMakeLists.txt
index 8c471a04..6a7ad3ec 100644
--- a/modules/cellframe-sdk/mempool/CMakeLists.txt
+++ b/modules/cellframe-sdk/mempool/CMakeLists.txt
@@ -194,7 +194,7 @@ endif()
file(GLOB CHAIN_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_PYTHON_SRCS} ${CHAIN_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/net/CMakeLists.txt b/modules/cellframe-sdk/net/CMakeLists.txt
index 1de78a58..e4f5331a 100644
--- a/modules/cellframe-sdk/net/CMakeLists.txt
+++ b/modules/cellframe-sdk/net/CMakeLists.txt
@@ -179,7 +179,7 @@ endif()
file(GLOB CHAIN_NET_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_NET_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_NET_PYTHON_SRCS} ${CHAIN_NET_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/net/srv/CMakeLists.txt b/modules/cellframe-sdk/net/srv/CMakeLists.txt
index 5c36cf17..2967ffb2 100644
--- a/modules/cellframe-sdk/net/srv/CMakeLists.txt
+++ b/modules/cellframe-sdk/net/srv/CMakeLists.txt
@@ -179,7 +179,7 @@ endif()
file(GLOB CHAIN_NET_SRV_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_NET_SRV_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_NET_SRV_PYTHON_SRCS} ${CHAIN_NET_SRV_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/type/blocks/CMakeLists.txt b/modules/cellframe-sdk/type/blocks/CMakeLists.txt
index 8978d4b4..c31be08a 100644
--- a/modules/cellframe-sdk/type/blocks/CMakeLists.txt
+++ b/modules/cellframe-sdk/type/blocks/CMakeLists.txt
@@ -194,7 +194,7 @@ endif()
file(GLOB CHAIN_CS_DAG_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_CS_DAG_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_CS_DAG_PYTHON_SRCS} ${CHAIN_CS_DAG_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/type/dag/CMakeLists.txt b/modules/cellframe-sdk/type/dag/CMakeLists.txt
index 671bdabf..c4d00004 100644
--- a/modules/cellframe-sdk/type/dag/CMakeLists.txt
+++ b/modules/cellframe-sdk/type/dag/CMakeLists.txt
@@ -194,7 +194,7 @@ endif()
file(GLOB CHAIN_CS_DAG_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_CS_DAG_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_CS_DAG_PYTHON_SRCS} ${CHAIN_CS_DAG_PYTHON_HEADERS})
diff --git a/modules/cellframe-sdk/wallet/CMakeLists.txt b/modules/cellframe-sdk/wallet/CMakeLists.txt
index da5a5f62..0a55b6c2 100644
--- a/modules/cellframe-sdk/wallet/CMakeLists.txt
+++ b/modules/cellframe-sdk/wallet/CMakeLists.txt
@@ -10,7 +10,7 @@ add_definitions("-DDAP_LOG_MT")
file(GLOB CHAIN_WALLET_PYTHON_SRCS src/*.c)
file(GLOB CHAIN_WALLET_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CHAIN_WALLET_PYTHON_SRCS} ${CHAIN_WALLET_PYTHON_HEADERS})
diff --git a/modules/dap-sdk/core/CMakeLists.txt b/modules/dap-sdk/core/CMakeLists.txt
index 6f977ca3..74ee8d66 100644
--- a/modules/dap-sdk/core/CMakeLists.txt
+++ b/modules/dap-sdk/core/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
file(GLOB CORE_SRCS src/*.c)
file(GLOB CORE_HEADERS src/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/ )
+include_directories(${PYTHON_INCLUDE_DIR} include/ )
add_library(${PROJECT_NAME} STATIC ${CORE_SRCS} ${CORE_UNIX_SRCS})
diff --git a/modules/dap-sdk/core/test/CMakeLists.txt b/modules/dap-sdk/core/test/CMakeLists.txt
index 2e840986..e9b0135c 100644
--- a/modules/dap-sdk/core/test/CMakeLists.txt
+++ b/modules/dap-sdk/core/test/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_C_STANDARD 11)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
file(GLOB TPO_INCLUDES include/*.h)
file(GLOB TPO_SRCS src/*.c)
diff --git a/modules/dap-sdk/crypto/CMakeLists.txt b/modules/dap-sdk/crypto/CMakeLists.txt
index 3d32d57e..4b8c0545 100644
--- a/modules/dap-sdk/crypto/CMakeLists.txt
+++ b/modules/dap-sdk/crypto/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
file(GLOB CRYPTO_PYTHON_SRCS src/*.c)
file(GLOB CRYPTO_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CRYPTO_PYTHON_SRCS} ${CRYPTO_PYTHON_HEADERS})
diff --git a/modules/dap-sdk/crypto/test/CMakeLists.txt b/modules/dap-sdk/crypto/test/CMakeLists.txt
index 1d68f521..e4fb70fa 100644
--- a/modules/dap-sdk/crypto/test/CMakeLists.txt
+++ b/modules/dap-sdk/crypto/test/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_C_STANDARD 11)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
file(GLOB TPO_INCLUDES include/*.h)
file(GLOB TPO_SRCS src/*.c)
diff --git a/modules/dap-sdk/net/client/CMakeLists.txt b/modules/dap-sdk/net/client/CMakeLists.txt
index 86228b44..4b2a34fd 100644
--- a/modules/dap-sdk/net/client/CMakeLists.txt
+++ b/modules/dap-sdk/net/client/CMakeLists.txt
@@ -74,7 +74,7 @@ endif()
file(GLOB CLIENT_PYTHON_SRCS src/*.c)
file(GLOB CLIENT_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${CLIENT_PYTHON_SRCS} ${CLIENT_PYTHON_HEADERS})
diff --git a/modules/dap-sdk/net/core/CMakeLists.txt b/modules/dap-sdk/net/core/CMakeLists.txt
index 1087eae8..9881a8d8 100644
--- a/modules/dap-sdk/net/core/CMakeLists.txt
+++ b/modules/dap-sdk/net/core/CMakeLists.txt
@@ -36,7 +36,7 @@ endif()
file(GLOB SERVER_CORE_PYTHON_SRCS src/*.c)
file(GLOB SERVER_CORE_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${SERVER_CORE_PYTHON_SRCS} ${SERVER_CORE_PYTHON_HEADERS})
diff --git a/modules/dap-sdk/net/server/enc/CMakeLists.txt b/modules/dap-sdk/net/server/enc/CMakeLists.txt
index d152d9ec..e81e1b32 100644
--- a/modules/dap-sdk/net/server/enc/CMakeLists.txt
+++ b/modules/dap-sdk/net/server/enc/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
file(GLOB ENC_SERVER_SRCS src/*.c)
file(GLOB ENC_SERVER_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/ )
+include_directories(${PYTHON_INCLUDE_DIR} include/ )
add_library(${PROJECT_NAME} STATIC ${ENC_SERVER_SRCS} ${ENC_SERVER_HEADERS})
diff --git a/modules/dap-sdk/net/server/http/CMakeLists.txt b/modules/dap-sdk/net/server/http/CMakeLists.txt
index d2a1ac98..6031f9ae 100644
--- a/modules/dap-sdk/net/server/http/CMakeLists.txt
+++ b/modules/dap-sdk/net/server/http/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
file(GLOB SERVER_HTTP_SIMPLE_SRCS src/*.c)
file(GLOB SERVER_HTTP_SIMPLE_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/ )
+include_directories(${PYTHON_INCLUDE_DIR} include/ )
add_library(${PROJECT_NAME} STATIC ${SERVER_HTTP_SIMPLE_SRCS} ${SERVER_HTTP_SIMPLE_HEADERS} ${CORE_UNIX_SRCS})
diff --git a/modules/dap-sdk/net/server/json_rpc/CMakeLists.txt b/modules/dap-sdk/net/server/json_rpc/CMakeLists.txt
index ad81b11d..b993b784 100644
--- a/modules/dap-sdk/net/server/json_rpc/CMakeLists.txt
+++ b/modules/dap-sdk/net/server/json_rpc/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
file(GLOB SERVER_JSON_RPC_SIMPLE_SRCS src/*.c)
file(GLOB SERVER_JSON_RPC_SIMPLE_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/ )
+include_directories(${PYTHON_INCLUDE_DIR} include/ )
add_library(${PROJECT_NAME} STATIC ${SERVER_JSON_RPC_SIMPLE_SRCS} ${SERVER_JSON_RPC_SIMPLE_HEADERS} ${CORE_UNIX_SRCS})
diff --git a/modules/dap-sdk/net/stream/stream/CMakeLists.txt b/modules/dap-sdk/net/stream/stream/CMakeLists.txt
index 65cdfa53..92b1b985 100644
--- a/modules/dap-sdk/net/stream/stream/CMakeLists.txt
+++ b/modules/dap-sdk/net/stream/stream/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
file(GLOB SERVER_HTTP_SIMPLE_SRCS src/*.c)
file(GLOB SERVER_HTTP_SIMPLE_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/ )
+include_directories(${PYTHON_INCLUDE_DIR} include/ )
add_library(${PROJECT_NAME} STATIC ${SERVER_HTTP_SIMPLE_SRCS} ${SERVER_HTTP_SIMPLE_HEADERS} ${CORE_UNIX_SRCS})
diff --git a/modules/plugins/CMakeLists.txt b/modules/plugins/CMakeLists.txt
index 01719116..6f692a52 100644
--- a/modules/plugins/CMakeLists.txt
+++ b/modules/plugins/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
file(GLOB DAP_PLUGINS_PYTHON_SRCS src/*.c)
file(GLOB DAP_PLUGINS_PYTHON_HEADERS include/*.h)
-include_directories(${PYTHON_INCLUDE_PATH} include/)
+include_directories(${PYTHON_INCLUDE_DIR} include/)
add_library(${PROJECT_NAME} STATIC ${DAP_PLUGINS_PYTHON_SRCS} ${DAP_PLUGINS_PYTHON_HEADERS})
--
GitLab