Skip to content
Snippets Groups Projects
Commit 6a731c75 authored by Roman Khlopkov's avatar Roman Khlopkov 🔜
Browse files

Merge branch 'feature-5173' into 'develop' 

Feature 5173

See merge request !267
parents 4015292b 9a6904c2
2 merge requests!459Release 5.1,!267Feature 5173
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 1
View file @ 6a731c75
...@@ -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 5) SET( CPACK_PACKAGE_VERSION_MAJOR 5)
SET( CPACK_PACKAGE_VERSION_MINOR 1) SET( CPACK_PACKAGE_VERSION_MINOR 1)
SET( CPACK_PACKAGE_VERSION_PATCH 5) SET( CPACK_PACKAGE_VERSION_PATCH 0)
# 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 @ 76b49a41
Compare 596ac6d9...76b49a41
Subproject commit 596ac6d9686ea2ea0d62b237748669e19f66d7a0 Subproject commit 76b49a41e7dc27fcc02f3e1f815b46a47ebd38db
python-cellframe @ 2b384f16
Compare a869d143...2b384f16
Subproject commit a869d143d7acdad68fd17e4e155ddbd4ffd9eb4a Subproject commit 2b384f16ba7007121b943e7c5b548cdba8ea674b
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