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

Merge branch 'features-3927' into 'master' 

features-3927

See merge request !138
parents d1fa93f8 b9b315b2
No related branches found
No related tags found
1 merge request!138features-3927
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 1
View file @ e4154cac
...@@ -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 3) SET( CPACK_PACKAGE_VERSION_MINOR 3)
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}\"") add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
......
cellframe-sdk @ b6ec5d92
Compare 6f94f7b4...b6ec5d92
Subproject commit 6f94f7b4ea9506f30c49692757d89c8b9719b41e Subproject commit b6ec5d920be946759f94e5aa12aa2dade036979c
python-cellframe @ fbb50e65
Compare ce2cc96f...fbb50e65
Subproject commit ce2cc96fe1b6405dada650bb0a992d58ee305a5e Subproject commit fbb50e65fec326cd6ea2b47ebebbe5aad8feba39
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