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

Merge branch 'upd' into 'master'

[*] submodule update

See merge request !159
parents c0b61583 ecc31c9d
No related branches found
No related tags found
1 merge request!159[*] submodule update
...@@ -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 3) SET( CPACK_PACKAGE_VERSION_MAJOR 3)
SET( CPACK_PACKAGE_VERSION_MINOR 5) SET( CPACK_PACKAGE_VERSION_MINOR 5)
SET( CPACK_PACKAGE_VERSION_PATCH 8) SET( CPACK_PACKAGE_VERSION_PATCH 9)
# init CellFrame SDK # init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
......
Subproject commit 8ec1a1ba820611ee2aa18d97a722b0391e7167fc Subproject commit e85f8701f5a93caca2e714a2ba331b888bbf069d
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