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

Merge branch 'feature-3516' into 'master'

updated submodules and version

See merge request !108
parents f64b66e6 a68977a5
No related branches found
No related tags found
1 merge request!108updated submodules and version
...@@ -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 2) SET( CPACK_PACKAGE_VERSION_MAJOR 2)
SET( CPACK_PACKAGE_VERSION_MINOR 14) SET( CPACK_PACKAGE_VERSION_MINOR 14)
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 0c1f3acea16dde2f67d23c856a7c7fadd1bceacf Subproject commit 90042abe52f6103a8aae8eccc45b191c3b78b836
Subproject commit f3babc654fa7233dec17b88515e2bc5b061bd9a6 Subproject commit bb89f309040d195488cee0ce33b8929b994ad346
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