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

Merge branch 'bugs-4028' into 'master'

bugs-4028

See merge request !148
parents fe5be44d da792e9a
No related branches found
No related tags found
1 merge request!148bugs-4028
...@@ -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 3) SET( CPACK_PACKAGE_VERSION_MAJOR 3)
SET( CPACK_PACKAGE_VERSION_MINOR 5) SET( CPACK_PACKAGE_VERSION_MINOR 5)
SET( CPACK_PACKAGE_VERSION_PATCH 1) SET( CPACK_PACKAGE_VERSION_PATCH 2)
# init CellFrame SDK # init CellFrame SDK
add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
......
Subproject commit f7f554e8eec82cdf674050f5a3943c7d3f43af83 Subproject commit b98b7070e24b073ed99bf22ad2d1cb0829b40328
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