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

Merge branch 'hotfix-4903' into 'master' 

hotfix-4903

See merge request !234
parents e2e3842e 27ff36fd
No related branches found
No related tags found
1 merge request!234hotfix-4903
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 1
View file @ 895619ed
...@@ -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 43) SET( CPACK_PACKAGE_VERSION_PATCH 44)
# 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 @ 10816b7c
Compare 7264eb0f...10816b7c
Subproject commit 7264eb0f4e15c5138fa33746350572ac60eb56ec Subproject commit 10816b7c32a04f08deff0ba8eb6e4f89935f4f33
prod_build @ 83d26f48
Compare f427db66...83d26f48
Subproject commit f427db665b14cba108a50e8e67798c695a7bee24 Subproject commit 83d26f48ff501b52d7a7059ca089754a78c041b2
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