Skip to content
Snippets Groups Projects
Commit fce641a2 authored by Dmitriy A. Gerasimov's avatar Dmitriy A. Gerasimov
Browse files

[!] New 4.2 branch

parent cbe4a7ed
No related branches found
No related tags found
1 merge request!272Feature 5173
......@@ -5,11 +5,11 @@
[submodule "python-cellframe"]
path = python-cellframe
url = ../python-cellframe.git
branch = master
branch = develop
[submodule "cellframe-sdk"]
path = cellframe-sdk
url = ../cellframe-sdk.git
branch = master
branch = develop
[submodule "prod_build"]
path = prod_build
url = ../prod_build_cellframe-node
......@@ -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 1)
SET( CPACK_PACKAGE_VERSION_PATCH 25)
SET( CPACK_PACKAGE_VERSION_MINOR 2)
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}\"")
......
Subproject commit 3f30ebe8cc5b22b2c8f8ec294e4dbcdbd2b01645
Subproject commit b2f12f321ed748ce989fca9b10a9bc2c7abe1b1c
Subproject commit 25c1913eb6224a3eb7592438a977365501593a6f
Subproject commit a26bb987ce1d029f9ca3677f0d24abaa0dc53250
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