From 29e3155cde1b6d032bed23baac6bc0de99830a95 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <naeper@demlabs.net>
Date: Wed, 5 May 2021 13:05:00 +0700
Subject: [PATCH] [!] Release candidate 4.4
---
CMakeLists.txt | 12 +++++++-----
cellframe-sdk | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffdcfb098..dbf75e2e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ set(CMAKE_C_STANDARD 11)
# Predefine project
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 4)
-SET( CPACK_PACKAGE_VERSION_MINOR 3)
-SET( CPACK_PACKAGE_VERSION_PATCH 46)
+SET( CPACK_PACKAGE_VERSION_MINOR 4)
+SET( CPACK_PACKAGE_VERSION_PATCH 0)
# init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"")
@@ -41,9 +41,9 @@ add_subdirectory(cellframe-sdk)
if(UNIX)
if(DARWIN)
- SET(CMAKE_INSTALL_PREFIX "/usr/local/CellframeNode")
- SET(CPACK_INSTALL_PREFIX "/usr/local/CellframeNode")
- SET(DESTDIR "/usr/local/CellframeNode")
+ SET(CMAKE_INSTALL_PREFIX "/Applications/Cellframe.app/Contents/Resources")
+ SET(CPACK_INSTALL_PREFIX "/Applications/Cellframe.app/Contents/Resources")
+ SET(DESTDIR "/Applications/Cellframe.app/Contents/Resources")
else()
SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
@@ -242,6 +242,8 @@ endif()
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*")
if(LINUX)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.linux/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*")
+elseif(DARWIN)
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.darwin/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*")
elseif(BSD)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.bsd/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*")
endif()
diff --git a/cellframe-sdk b/cellframe-sdk
index 01bcfa782..ca89718a4 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit 01bcfa7825e605f04dcfb1317482440e3dd99d43
+Subproject commit ca89718a48f90b97eb98fe6a96091aab867e0f44
--
GitLab