diff --git a/CMakeLists.txt b/CMakeLists.txt index e6a28fd944ffb23b84a16610eb2cd0e058bca4ff..8cad16fd467afdb12d11e0a73448865f420a4d54 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 3) -SET( CPACK_PACKAGE_VERSION_MINOR 0) -SET( CPACK_PACKAGE_VERSION_PATCH 4) +SET( CPACK_PACKAGE_VERSION_MINOR 1) +SET( CPACK_PACKAGE_VERSION_PATCH 0) # init CellFrame SDK add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") @@ -194,16 +194,6 @@ if(UNIX AND NOT WIN32) find_package(PythonLibs REQUIRED) include_directories(${PYTHON_INCLUDE_DIR} include/) - add_subdirectory(cellframe-sdk-python/libdap-python) - add_subdirectory(cellframe-sdk-python/libdap-server-core-python) - add_subdirectory(cellframe-sdk-python/libdap-crypto-python) - add_subdirectory(cellframe-sdk-python/libdap-chain-common-python) - add_subdirectory(cellframe-sdk-python/libdap-chain-net-python) - add_subdirectory(cellframe-sdk-python/libdap-chain-gdb-python) - add_subdirectory(cellframe-sdk-python/libdap-chain-python) - add_subdirectory(cellframe-sdk-python/libdap-app-cli-python) - add_subdirectory(cellframe-sdk-python/libdap-client-python) - add_subdirectory(cellframe-sdk-python/libdap-chain-wallet-python) add_subdirectory(python-cellframe) add_subdirectory(libdap-plugins-python) set(NODE_LIBRARIES ${NODE_LIBRARIES} ${PYTHON_LIBRARIES} dap_plugins_python) diff --git a/cellframe-sdk b/cellframe-sdk index db871b3bfdc285d832a0f0842e4eab5f1ce0e577..158a2408776833dbf90ddb4e2ec6c040fd8d2c3a 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit db871b3bfdc285d832a0f0842e4eab5f1ce0e577 +Subproject commit 158a2408776833dbf90ddb4e2ec6c040fd8d2c3a diff --git a/cellframe-sdk-python b/cellframe-sdk-python deleted file mode 160000 index dabbc982851f50c69b63f29430b0d81ad0ac9a36..0000000000000000000000000000000000000000 --- a/cellframe-sdk-python +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dabbc982851f50c69b63f29430b0d81ad0ac9a36 diff --git a/python-cellframe b/python-cellframe index c67dd84c16c36b491fa78ae50735d520cf6a9bd1..aaa5970ab49fd9c2624b216970fcb576822b5685 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit c67dd84c16c36b491fa78ae50735d520cf6a9bd1 +Subproject commit aaa5970ab49fd9c2624b216970fcb576822b5685