From 28611db4260d0b46983b13995c17d004d5b24e59 Mon Sep 17 00:00:00 2001 From: EDDragonWolf Date: Sat, 20 Jan 2018 04:01:58 -0800 Subject: [PATCH 1/5] Disable supernode compilation for MacOS --- src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7608092c9..0c60f69a1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -109,7 +109,9 @@ if(NOT IOS) add_subdirectory(rpc) endif() add_subdirectory(wallet) +if (NOT APPLE) add_subdirectory(supernode) +endif() if(NOT IOS) add_subdirectory(p2p) endif() From 6a84368aa0cdd98c8fbf534159a7eb3067fbff50 Mon Sep 17 00:00:00 2001 From: EDDragonWolf Date: Sat, 20 Jan 2018 04:29:35 -0800 Subject: [PATCH 2/5] Disabled supernode tests compilation for Mac OS --- tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 224903bf1..76da54349 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -92,7 +92,9 @@ add_subdirectory(difficulty) add_subdirectory(hash) add_subdirectory(net_load_tests) add_subdirectory(libwallet_api_tests) +if (NOT APPLE) add_subdirectory(supernode_tests) +endif() # add_subdirectory(daemon_tests) From 36c1a924abcd9e53be501c192e8bfcd578029548 Mon Sep 17 00:00:00 2001 From: EDDragonWolf Date: Sat, 20 Jan 2018 05:11:00 -0800 Subject: [PATCH 3/5] Disabled unit_tests on Mac OS since it has dependencies from supernode --- tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 76da54349..b9b28f9a7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -87,7 +87,9 @@ add_subdirectory(crypto) add_subdirectory(functional_tests) add_subdirectory(performance_tests) add_subdirectory(core_proxy) +if (NOT APPLE) add_subdirectory(unit_tests) +endif() add_subdirectory(difficulty) add_subdirectory(hash) add_subdirectory(net_load_tests) From af35e3a8b02059f62c2fc6e322753c88736d09c6 Mon Sep 17 00:00:00 2001 From: EDDragonWolf Date: Sat, 20 Jan 2018 06:15:51 -0800 Subject: [PATCH 4/5] Added separated DISABLE_SUPERNODE variable to disable supernode --- CMakeLists.txt | 2 ++ src/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a9d908e92..1e009ffb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,8 @@ cmake_minimum_required(VERSION 2.8.7) project(graftnetwork) +set(DISABLE_SUPERNODE APPLE) + function (die msg) if (NOT WIN32) string(ASCII 27 Esc) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0c60f69a1..21bc91ab7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -109,7 +109,7 @@ if(NOT IOS) add_subdirectory(rpc) endif() add_subdirectory(wallet) -if (NOT APPLE) +if (DISABLE_SUPERNODE) add_subdirectory(supernode) endif() if(NOT IOS) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b9b28f9a7..594fdf286 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -87,14 +87,14 @@ add_subdirectory(crypto) add_subdirectory(functional_tests) add_subdirectory(performance_tests) add_subdirectory(core_proxy) -if (NOT APPLE) +if (DISABLE_SUPERNODE) add_subdirectory(unit_tests) endif() add_subdirectory(difficulty) add_subdirectory(hash) add_subdirectory(net_load_tests) add_subdirectory(libwallet_api_tests) -if (NOT APPLE) +if (DISABLE_SUPERNODE) add_subdirectory(supernode_tests) endif() From 02095f6c883d92a2349078daa8df76838a54fadd Mon Sep 17 00:00:00 2001 From: EDDragonWolf Date: Sat, 20 Jan 2018 07:16:37 -0800 Subject: [PATCH 5/5] Fixed build condition --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e009ffb2..bbcc308a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ cmake_minimum_required(VERSION 2.8.7) project(graftnetwork) -set(DISABLE_SUPERNODE APPLE) +set(DISABLE_SUPERNODE ${APPLE}) function (die msg) if (NOT WIN32) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 21bc91ab7..8c3d0b0aa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -109,7 +109,7 @@ if(NOT IOS) add_subdirectory(rpc) endif() add_subdirectory(wallet) -if (DISABLE_SUPERNODE) +if (NOT DISABLE_SUPERNODE) add_subdirectory(supernode) endif() if(NOT IOS) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 594fdf286..27d64f308 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -87,14 +87,14 @@ add_subdirectory(crypto) add_subdirectory(functional_tests) add_subdirectory(performance_tests) add_subdirectory(core_proxy) -if (DISABLE_SUPERNODE) +if (NOT DISABLE_SUPERNODE) add_subdirectory(unit_tests) endif() add_subdirectory(difficulty) add_subdirectory(hash) add_subdirectory(net_load_tests) add_subdirectory(libwallet_api_tests) -if (DISABLE_SUPERNODE) +if (NOT DISABLE_SUPERNODE) add_subdirectory(supernode_tests) endif()