From 1cd07015d1e23f938329503d29eaa1446e461997 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <naeper@demlabs.net>
Date: Thu, 11 Mar 2021 14:12:23 +0700
Subject: [PATCH] [*] MacOS Catalina build errors fix [*] Removed useless
length variability for wallet struct
---
CMakeLists.txt | 19 +++++++++++++++----
cellframe-sdk | 2 +-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1e328a..d737590 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 4)
SET( CPACK_PACKAGE_VERSION_MINOR 3)
-SET( CPACK_PACKAGE_VERSION_PATCH 41)
+SET( CPACK_PACKAGE_VERSION_PATCH 42)
#
# init CellFrame SDK
@@ -36,12 +36,18 @@ add_subdirectory(cellframe-sdk)
if(UNIX)
- if(LINUX)
- set(SUPPORT_PYTHON_PLUGINS ON)
- message("[*] Linux package setup")
+ if(DARWIN)
+ SET(CMAKE_INSTALL_PREFIX "/usr/local/DapCashNode")
+ SET(CPACK_INSTALL_PREFIX "/usr/local/DapCashNode")
+ SET(DESTDIR "/usr/local/DapCashNode")
+ else()
SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
SET(DESTDIR "/opt/${PROJECT_NAME}")
+ endif()
+ if(LINUX)
+ set(SUPPORT_PYTHON_PLUGINS ON)
+ message("[*] Linux package setup")
SET( CPACK_GENERATOR "DEB")
@@ -126,6 +132,11 @@ if(WIN32)
endif()
+if(BSD)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -L /usr/local/lib ")
+ set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -L /usr/local/lib")
+endif()
+
#add_executable(${PROJECT_NAME}-cli "sources/main_node_cli.c" "sources/main_node_cli_shell.c" "sources/main_node_cli_net.c" )
#add_executable(${PROJECT_NAME}-tool "sources/main_node_tool.c" )
diff --git a/cellframe-sdk b/cellframe-sdk
index d5f9489..e0402a3 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit d5f9489f3fc11cbc78e0e1733a4527f63e9ce730
+Subproject commit e0402a38577e0755dd8604faf9622a06d0e052fe
--
GitLab