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

Merge branch 'bugfix-4970' into 'master'

update submodule

See merge request !247
parents 3b74e2dc d2b8c946
No related branches found
No related tags found
1 merge request!247update submodule
...@@ -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 4) SET( CPACK_PACKAGE_VERSION_MAJOR 4)
SET( CPACK_PACKAGE_VERSION_MINOR 4) SET( CPACK_PACKAGE_VERSION_MINOR 4)
SET( CPACK_PACKAGE_VERSION_PATCH 51) SET( CPACK_PACKAGE_VERSION_PATCH 52)
# init CellFrame SDK # init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"") add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"")
......
Subproject commit 7e7c6a77ed894ea7b1b859480ab4df4d9bc3d665 Subproject commit 44f1ac77cd56e40f0c82703c64db96f87edd74b3
Subproject commit 55f11e362073a27247b81bdf912b007fcaf41e5d Subproject commit b333e00030825972ffc4ae59e07e7c2f1b58ec15
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