diff --git a/CMakeLists.txt b/CMakeLists.txt
index 440fb9872f3f89befc50151a5088aae3a30005f1..d0f6cb848d5225f11002ef4c0a4f4944ab75a273 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 7622fde809b87ca71583e355fea97084f510160c..1cb559f2e2c7e7138b4792f0da4ffbb3972f20f6 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 082361f7c9a6e5c11b81e8aff83f91725f4f05a5..550af1930c2f9722971d7a1f83775a2f26853af0 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 468535e397a50ad994fcc03ee0325c0b1e683c98..bf4b258ce8c3993cd255971da3ce528bb35f71ab 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 a88e4725b0d361c24d4913677516f34d971966dd..3908e8509e37605017d8cd4807d41e220bdbd977 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 e2ff1e368262c0c8a9db107f7b6fae060f055d2b..67c44292560bdabf786f163cd806fa8123b00124 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 86ddd443cd37ed8b1e9c8b86f8c71a23fad56d1b..2c3906377e303b345967ff3a416688bc06e85d97 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 cb176f762a6fe1e1350783d9c701d520fd8cf4d1..877c28732d71cee24573f853c10ad4da21f56dff 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 8c471a04c4be3d90f82671e4e75610e561f07985..6a7ad3ec1ab3892da3299faf11f68adcd634a064 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 1de78a581e14882478454c5c3502fc5a15f7ccc7..e4f5331a35eb0e5b33375b7834c3f899a8f8baca 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 5c36cf1729837c0c32e4e1cd9880e657ddd61250..2967ffb2dcb1bd67f32e9dbada7c393f82104eeb 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 8978d4b4c6639a40a93e43ed677e5b0e70d44c3c..c31be08ab07fa4a53c3e587d78c115953f750e7e 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 671bdabf81486e509c9f64a9ab62e6b27592f3b4..c4d00004a7da0d998742908d451c473443948d9d 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 da5a5f62724cb24e3f838ee33422128ca74f4fb6..0a55b6c2c8c273b759e2ed5071180cec5ef84d87 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 6f977ca3e2dc238c1f7b609a9b480353e00cbab8..74ee8d661c16316de1b9f35228b9368d8191345f 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 2e840986b760abf11147accf2875c2437697166a..e9b0135cee4a20688a3dfecd04ee8dc097bca81d 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 3d32d57e4eac419e0bb52f2595d1cbbbcfc8776b..4b8c0545a5c0f1a4d454257ca78b0c8daffc10c9 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 1d68f521c3e6bd2a8304f1da47a52ce25dcda7c6..e4fb70fad41d1ae2d7f0a48961840252db6311c5 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 86228b4466ba01e86fa57c42f8ad0af13bb48f25..4b2a34fd193c80e45306a35d82bad9ffaf0277e0 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 1087eae8c0148a95322e26038bb9a54cfab9d46a..9881a8d879d0f7298c03b43857abcff1f8177bf7 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 d152d9ec33ee906c3049a47788d96d8a40987699..e81e1b321ce7acc783b722dd61b72f7c946601de 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 d2a1ac98bd75d18c916ac9bb168b4f2ee4e395a7..6031f9aeef4b551089ff7b801471e9b6bf52bc6b 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 ad81b11d2788f329d9903e73125444992113adef..b993b7840b5834983990e1033a719f1e6d791315 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 65cdfa538d3510c9995bad4defdecc4b9b9ea8df..92b1b9855419eff97a920c05ebb5b10294e071a6 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 01719116dc5788fb2d1239a8555eb616c4babf4c..6f692a5215f5a2ca3304b770b8f159886613312c 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})