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

Merge branch 'hotfix-4908' into 'master'

hotfix-4908

See merge request !251
parents f8816a75 475afe2b
No related branches found
No related tags found
1 merge request!251hotfix-4908
...@@ -8,7 +8,8 @@ set(CMAKE_C_STANDARD 11) ...@@ -8,7 +8,8 @@ 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 54) SET( CPACK_PACKAGE_VERSION_PATCH 55)
# 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 4a6c93e47f902eaf02e5ab30e6e56a988fb17080 Subproject commit bd40f27b7a4f3cbca99e4879aa7ce5d6899905bc
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