From 3a2b60a6d80921c64141fed8c07246f10d1d2837 Mon Sep 17 00:00:00 2001 From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net> Date: Wed, 4 Nov 2020 22:50:24 +0700 Subject: [PATCH] [*] added main() in satoshi-script-tpl.c --- CMakeLists.txt | 27 ++++--------------- .../satoshi-script-tpl/satoshi-script-tpl.c | 4 +++ 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3574b98453..bd16da15d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,35 +2,18 @@ project(cellframe-sdk C) cmake_minimum_required(VERSION 2.8) set(CMAKE_C_STANDARD 11) -set(CELLFRAME_SDK_NATIVE_VERSION "2.7-2") +set(CELLFRAME_SDK_NATIVE_VERSION "2.7-3") add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"") -set(DAPSDK_MODULES "") -if (CELLFRAME_MODULES MATCHES "core") +if (BUILD_TESTS) + SET(DAPSDK_MODULES "") SET(DAPSDK_MODULES "${DAPSDK_MODULES} core crypto") -endif() - - -if (CELLFRAME_MODULES MATCHES "network") - set(DAPSDK_MODULES "${DAPSDK_MODULES} network-core network-client network-server") -endif() - -if (BUILD_CRYPTO_TESTS) - if ( NOT(DAPSDK_MODULES MATCHES "core")) - SET(DAPSDK_MODULES "${DAPSDK_MODULES} core") - endif() - if ( NOT(DAPSDK_MODULES MATCHES "crypto")) - SET(DAPSDK_MODULES "${DAPSDK_MODULES} crypto") - endif() - set(BUILD_TESTS ON) -endif() - -if(BUILD_TESTS) + SET(DAPSDK_MODULES "${DAPSDK_MODULES} network-core network-client network-server") include(cmake/OS_Detection.cmake) + add_subdirectory(dap-sdk) endif() -add_subdirectory(dap-sdk) add_subdirectory(3rdparty/monero_crypto) add_subdirectory(3rdparty/cuttdb) add_subdirectory(modules/) diff --git a/modules/bridge/btc/satoshi-script-tpl/satoshi-script-tpl.c b/modules/bridge/btc/satoshi-script-tpl/satoshi-script-tpl.c index e69de29bb2..509217119e 100644 --- a/modules/bridge/btc/satoshi-script-tpl/satoshi-script-tpl.c +++ b/modules/bridge/btc/satoshi-script-tpl/satoshi-script-tpl.c @@ -0,0 +1,4 @@ +int main (int argc, const char * argv[]) +{ + return 0; +} -- GitLab