Skip to content
Snippets Groups Projects
Commit 29e3155c authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

[!] Release candidate 4.4

parent ea937f18
No related branches found
No related tags found
1 merge request!226Release 4.4
...@@ -7,8 +7,8 @@ set(CMAKE_C_STANDARD 11) ...@@ -7,8 +7,8 @@ set(CMAKE_C_STANDARD 11)
# Predefine project # Predefine project
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 4) SET( CPACK_PACKAGE_VERSION_MAJOR 4)
SET( CPACK_PACKAGE_VERSION_MINOR 3) SET( CPACK_PACKAGE_VERSION_MINOR 4)
SET( CPACK_PACKAGE_VERSION_PATCH 46) SET( CPACK_PACKAGE_VERSION_PATCH 0)
# init CellFrame SDK # init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"") add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"")
...@@ -41,9 +41,9 @@ add_subdirectory(cellframe-sdk) ...@@ -41,9 +41,9 @@ add_subdirectory(cellframe-sdk)
if(UNIX) if(UNIX)
if(DARWIN) if(DARWIN)
SET(CMAKE_INSTALL_PREFIX "/usr/local/CellframeNode") SET(CMAKE_INSTALL_PREFIX "/Applications/Cellframe.app/Contents/Resources")
SET(CPACK_INSTALL_PREFIX "/usr/local/CellframeNode") SET(CPACK_INSTALL_PREFIX "/Applications/Cellframe.app/Contents/Resources")
SET(DESTDIR "/usr/local/CellframeNode") SET(DESTDIR "/Applications/Cellframe.app/Contents/Resources")
else() else()
SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}") SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}") SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
...@@ -242,6 +242,8 @@ endif() ...@@ -242,6 +242,8 @@ endif()
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*") INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*")
if(LINUX) if(LINUX)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.linux/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*") 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) elseif(BSD)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.bsd/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*") INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist.bsd/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*")
endif() endif()
......
Subproject commit 01bcfa7825e605f04dcfb1317482440e3dd99d43 Subproject commit ca89718a48f90b97eb98fe6a96091aab867e0f44
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment