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

Merge branch 'bugs-3895' into 'master'

bugs-3895

See merge request !133
parents d2a1a4ae 42dbfdde
No related branches found
No related tags found
1 merge request!133bugs-3895
...@@ -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 3) SET( CPACK_PACKAGE_VERSION_MINOR 3)
SET( CPACK_PACKAGE_VERSION_PATCH 3) SET( CPACK_PACKAGE_VERSION_PATCH 4)
# init CellFrame SDK # init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
......
Subproject commit b7efdc01182b443a3d2c685bd43bfac058dc04d2 Subproject commit 840602f3caa772381b5884b6069913e36e741979
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