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

Merge branch 'hotfix-4874-1' into 'master'

hotfix-4874-1

See merge request !237
parents 28434d5f 8fdde01a
No related branches found
No related tags found
1 merge request!237hotfix-4874-1
...@@ -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 46) SET( CPACK_PACKAGE_VERSION_PATCH 47)
# 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 ecb1442ebd2bd5370a4d0cff158847a11646259b Subproject commit 577b6034a910fa0990ad7ad7624d560cb9a139c1
Subproject commit a12f0d30f1e90e2438e0c6bcc1a00204b3e32a01 Subproject commit 55f11e362073a27247b81bdf912b007fcaf41e5d
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