Skip to content
Snippets Groups Projects
Commit 83163b97 authored by Roman Khlopkov's avatar Roman Khlopkov 🔜 Committed by dmitriy.gerasimov
Browse files

hotfix-5037

parent 0e1c80c6
No related branches found
No related tags found
1 merge request!249hotfix-5037
...@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11) ...@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
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 4) SET( CPACK_PACKAGE_VERSION_MINOR 4)
SET( CPACK_PACKAGE_VERSION_PATCH 53) SET( CPACK_PACKAGE_VERSION_PATCH 54)
# 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}\"")
...@@ -38,11 +38,12 @@ elseif(LINUX) ...@@ -38,11 +38,12 @@ elseif(LINUX)
set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn") set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn")
endif() endif()
add_subdirectory(cellframe-sdk)
if (CELLFRAME_MODULES MATCHES "modules-dynamic") if (CELLFRAME_MODULES MATCHES "modules-dynamic")
add_definitions("-DDAP_MODULES_DYNAMIC") add_definitions("-DDAP_MODULES_DYNAMIC")
endif() endif()
add_subdirectory(cellframe-sdk)
if(UNIX) if(UNIX)
if(DARWIN) if(DARWIN)
SET(CMAKE_INSTALL_PREFIX "${USERDIR_PATH}/Applications/Cellframe.app") SET(CMAKE_INSTALL_PREFIX "${USERDIR_PATH}/Applications/Cellframe.app")
......
Subproject commit 971a39325decfe6bd90bc1cdea5228ce76006355 Subproject commit 4a6c93e47f902eaf02e5ab30e6e56a988fb17080
Subproject commit b333e00030825972ffc4ae59e07e7c2f1b58ec15 Subproject commit 0aac23e31253e74c26c689c60261171f2f3878ec
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