From 213beafda785f0346eed78efc7363d69680eab09 Mon Sep 17 00:00:00 2001
From: Dmitry Gerasimov <dmitriy.gerasimov@demlabs.net>
Date: Mon, 20 Feb 2023 13:38:18 +0700
Subject: [PATCH] [*] Part of MacOS python support
---
CMakeLists.txt | 15 ++++++++++++++-
cellframe-sdk | 2 +-
dap-sdk | 2 +-
python-cellframe | 2 +-
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8add84bf3..883c437be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,13 @@ set(BUILD_WITH_GDB_DRIVER_MDBX ON)
#set(BUILD_CRYPTO_TESTS ON)
set(BUILD_WITH_ZIP OFF)
+option(SUPPORT_PYTHON_PLUGINS DEFAULT OFF)
+
+#if(MACOS)
+# if(SUPPORT_PYTHON_PLUGINS)
+# set(BUILD_WITH_PYTHON_ENV ON)
+# endif()
+#endif()
if(LINUX)
set(BUILD_WITH_PYTHON_ENV ON)
@@ -240,7 +247,13 @@ if(UNIX AND NOT WIN32)
find_package(PythonLibs REQUIRED)
add_definitions("-DDAP_BUILD_WITH_PYTHON_ENV")
- set(PYTHON_LIBRARIES ${PYTHON_LIBRARIES} -lssl -lcrypto -lcrypt -lnsl -lz -lutil -lexpat )
+ if(MACOS OR IOS)
+ set(PYTHON_LIBRARIES ${PYTHON_LIBRARIES} -lssl -lcrypto -lz -lutil -lexpat )
+ else()
+ if(LINUX OR BSD)
+ set(PYTHON_LIBRARIES ${PYTHON_LIBRARIES} -lssl -lcrypto -lcrypt -lnsl -lz -lutil -lexpat )
+ endif()
+ endif()
else()
set(Python_ADDITIONAL_VERSION 3.9 3.8 3.7 3.6 3.5 3.4)
diff --git a/cellframe-sdk b/cellframe-sdk
index 137af6ea3..f0f7c9ecb 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit 137af6ea30657e91bfabbf27e58e27deb03e03fa
+Subproject commit f0f7c9ecb16f5faebc803a6b9a486055f286178b
diff --git a/dap-sdk b/dap-sdk
index 6aac418f3..b8c1fdc02 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit 6aac418f3e9914558f9f472d635d5d8eed20ab5f
+Subproject commit b8c1fdc024bb1169109c0bf73baf130c6a60f7af
diff --git a/python-cellframe b/python-cellframe
index 469aafe08..81ff2ae50 160000
--- a/python-cellframe
+++ b/python-cellframe
@@ -1 +1 @@
-Subproject commit 469aafe088df7dfca93631e8e82877aaeb9d969a
+Subproject commit 81ff2ae5025b261c5d9eec51567bdd32235a7f09
--
GitLab