From cc335b67bf48c80000f72cb7d0b2d605c0dbd326 Mon Sep 17 00:00:00 2001
From: Evgeniy <sobiegrus@gmail.com>
Date: Tue, 7 Dec 2021 12:24:52 +0300
Subject: [PATCH] [+] Add commits from develop
05aeae50906df8dfa719d1d19ec11a793273aa9b, 9bc79e2700bd912ffb9ade322cb9876df2dbfa6d, 9190144d907fb68599c605574cad95ead750e595
---
.gitignore | 7 ++++++-
CMakeLists.txt | 15 +++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index e97c609120..09b4bb765b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
# Prerequisites
build/*
+cmake-build-*/
build_stretch/*
test/build
*.txt.user
@@ -67,4 +68,8 @@ Makefile
cmake_install.cmake
# Editor's temp files
-*~
\ No newline at end of file
+*~
+.idea/
+
+# OS files
+.DS_Store
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e7b2e50f2..e57aa8d600 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,21 @@ add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
#set(BUILD_CRYPTO_TESTS ON)
+if(NOT DEFINED ${CELLFRAME_MODULES})
+ include (cmake/OS_Detection.cmake)
+ if (WIN32)
+ set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+ elseif(BSD)
+ set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+ elseif(DARWIN)
+ set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+ elseif(ANDROID)
+ set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange")
+ elseif(LINUX)
+ set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-block-poa cs-dag-pos cs-block-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn")
+ endif()
+endif()
+
set(DAPSDK_MODULES "")
message("Cellframe modules: ${CELLFRAME_MODULES}")
--
GitLab