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

Merge branch 'hotfix-4943' into 'master' 

hotfix-4943

See merge request !243
parents 5c5b2843 e1263e12
No related branches found
No related tags found
1 merge request!243hotfix-4943
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 1
View file @ 280fb2f1
...@@ -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 49) SET( CPACK_PACKAGE_VERSION_PATCH 51)
# 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}\"")
......
cellframe-sdk @ 9677a59b
Compare 8ecc9ea0...9677a59b
Subproject commit 8ecc9ea0306a36d619a986d384e58a7f075c2f3d Subproject commit 9677a59b4e5adf4001ec146f4c92c31a23bf873e
prod_build @ f6f8d1e4
Compare 49be1d56...f6f8d1e4
Subproject commit 49be1d56fddb4d50488c5df86355d73cb7e3814d Subproject commit f6f8d1e4bf8ab62037f6eb5a17f807eef11a2f05
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment