diff --git a/.gitmodules b/.gitmodules index 5f643098e71beab7153eb42ccdcc759df8be1429..70590f1b6898f0e47e5a5f6d8f61c8152e714b89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index f871dbd7740d9ead897761c70395cfcce2ffed70..42b7065fc6a6af5d4dc4c957cff9a68682d3bb6d 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 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}\"") diff --git a/cellframe-sdk b/cellframe-sdk index 3f30ebe8cc5b22b2c8f8ec294e4dbcdbd2b01645..b2f12f321ed748ce989fca9b10a9bc2c7abe1b1c 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 3f30ebe8cc5b22b2c8f8ec294e4dbcdbd2b01645 +Subproject commit b2f12f321ed748ce989fca9b10a9bc2c7abe1b1c diff --git a/python-cellframe b/python-cellframe index 25c1913eb6224a3eb7592438a977365501593a6f..a26bb987ce1d029f9ca3677f0d24abaa0dc53250 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 25c1913eb6224a3eb7592438a977365501593a6f +Subproject commit a26bb987ce1d029f9ca3677f0d24abaa0dc53250