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

Merge branch 'bugs-4815' into 'release-4.4' 

bugs-4815

See merge request !218
parents dd766629 5d9e3cd3
No related branches found
No related tags found
2 merge requests!226Release 4.4,!218bugs-4815
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 1
View file @ 9e74b5d3
...@@ -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 8) SET( CPACK_PACKAGE_VERSION_PATCH 9)
# 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 @ 318c2459
Compare 01081038...318c2459
Subproject commit 01081038c9b0050173fc870971d8d291e62c7aad Subproject commit 318c24596f43f3b5b8ab854858f0749c55c7547a
prod_build @ 41ca66d2
Compare 5b7dd453...41ca66d2
Subproject commit 5b7dd4532bbe1233629df7148ea59f37d2e23754 Subproject commit 41ca66d2e7b4d1b0c31d42557e2d07dffbca953d
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