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

[*] Conflict resolved

parents 1c725dc5 44fb4551
No related branches found
No related tags found
2 merge requests!974bugfix-8996,!873Hotfix 8568
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 1
− 0
View file @ 2ac719e4
...@@ -35,6 +35,7 @@ include (cellframe-sdk/cmake/OS_Detection.cmake) ...@@ -35,6 +35,7 @@ include (cellframe-sdk/cmake/OS_Detection.cmake)
set(BUILD_WITH_GDB_DRIVER_MDBX ON) set(BUILD_WITH_GDB_DRIVER_MDBX ON)
#set(BUILD_WITH_GDB_DRIVER_PGSQL ON) #set(BUILD_WITH_GDB_DRIVER_PGSQL ON)
#set(BUILD_CRYPTO_TESTS ON) #set(BUILD_CRYPTO_TESTS ON)
#add_definitions("-DDAP_TPS_TEST")
set(BUILD_WITH_ZIP OFF) set(BUILD_WITH_ZIP OFF)
option(SUPPORT_PYTHON_PLUGINS DEFAULT OFF) option(SUPPORT_PYTHON_PLUGINS DEFAULT OFF)
......
cellframe-sdk @ d09c55d1
Compare 936aff7c...d09c55d1
Subproject commit 936aff7c66cb0a1ef5b3d64f66ef451456c3b3fd Subproject commit d09c55d1989a9b3493885b77e488a0023e9be0a2
version.mk
+ 1
− 1
View file @ 2ac719e4
VERSION_MAJOR=5 VERSION_MAJOR=5
VERSION_MINOR=2 VERSION_MINOR=2
VERSION_PATCH=14 VERSION_PATCH=15
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