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

Merge branch 'master' into release-3.0

parents de6953e3 03235c31
No related branches found
No related tags found
1 merge request!61bugs-5311
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 2
− 2
View file @ 319de580
...@@ -20,9 +20,9 @@ set(SUBMODULES_NO_BUILD ON) ...@@ -20,9 +20,9 @@ set(SUBMODULES_NO_BUILD ON)
if (NOT (SUPPORT_PYTHON_PLUGINS)) if (NOT (SUPPORT_PYTHON_PLUGINS))
if (NOT(WIN32)) if (NOT(WIN32))
set(CELLFRAME_MODULES "core chains network cs-none") set(CELLFRAME_MODULES "core chains network cs-none srv")
else() else()
set(CELLFRAME_MODULES "core chains network cs-none") set(CELLFRAME_MODULES "core chains network cs-none srv")
endif() endif()
include(cellframe-sdk/cmake/OS_Detection.cmake) include(cellframe-sdk/cmake/OS_Detection.cmake)
add_subdirectory(cellframe-sdk) add_subdirectory(cellframe-sdk)
......
cellframe-sdk @ 0bd76117
Compare 44f1ac77...0bd76117
Subproject commit 44f1ac77cd56e40f0c82703c64db96f87edd74b3 Subproject commit 0bd76117bf28dd4e8e6dd14305c16983d0ce8e21
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