From f855abab2971e095e4e9ef1664a34778f6a79b5d Mon Sep 17 00:00:00 2001
From: Arugula Bowl <arugula.bowl@gmail.com>
Date: Tue, 19 Jun 2018 21:18:37 +0000
Subject: [PATCH] Move rai/node library definition to separate CMakeLists.txt

---
 CMakeLists.txt                            | 32 +-------------
 rai/node/CMakeLists.txt                   | 54 +++++++++++++++++++++++
 rai/{ => node}/plat/posix/openclapi.cpp   |  0
 rai/{ => node}/plat/windows/openclapi.cpp |  0
 4 files changed, 55 insertions(+), 31 deletions(-)
 create mode 100644 rai/node/CMakeLists.txt
 rename rai/{ => node}/plat/posix/openclapi.cpp (100%)
 rename rai/{ => node}/plat/windows/openclapi.cpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34784713..30afe777 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,17 +243,14 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	set (PLATFORM_LIB_SOURCE rai/plat/windows/priority.cpp)
 	set (PLATFORM_SECURE_SOURCE rai/plat/windows/working.cpp)
-	set (PLATFORM_NODE_SOURCE rai/plat/windows/openclapi.cpp)
 	set (PLATFORM_WALLET_SOURCE rai/plat/windows/icon.cpp RaiBlocks.rc)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	set (PLATFORM_LIB_SOURCE rai/plat/linux/priority.cpp)
 	set (PLATFORM_SECURE_SOURCE rai/plat/posix/working.cpp)
-	set (PLATFORM_NODE_SOURCE rai/plat/posix/openclapi.cpp)
 	set (PLATFORM_WALLET_SOURCE rai/plat/default/icon.cpp)
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 	set (PLATFORM_LIB_SOURCE rai/plat/default/priority.cpp)
 	set (PLATFORM_SECURE_SOURCE rai/plat/posix/working.cpp)
-	set (PLATFORM_NODE_SOURCE rai/plat/posix/openclapi.cpp)
 	set (PLATFORM_WALLET_SOURCE rai/plat/default/icon.cpp)
 else ()
 	error ("Unknown platform: ${CMAKE_SYSTEM_NAME}")
@@ -268,10 +265,6 @@ file (WRITE ${CMAKE_BINARY_DIR}/bootstrap_weights.cpp "#include <cstddef>\n"
 	"	size_t rai_bootstrap_weights_size = sizeof(rai_bootstrap_weights) - 1;\n"
 	"}\n")
 	
-if (RAIBLOCKS_SECURE_RPC)
-	set (SECURE_RPC_SOURCE rai/node/rpc_secure.cpp rai/node/rpc_secure.hpp)
-endif ()
-
 add_library (secure
 	${PLATFORM_SECURE_SOURCE}
 	${CMAKE_BINARY_DIR}/bootstrap_weights.cpp
@@ -306,30 +299,7 @@ SET (RAI_LIB_SOURCES
 add_library (rai_lib SHARED ${RAI_LIB_SOURCES})
 add_library (rai_lib_static STATIC ${RAI_LIB_SOURCES})
 
-add_library (node
-	${PLATFORM_NODE_SOURCE}
-	${SECURE_RPC_SOURCE}
-	rai/node/bootstrap.cpp
-	rai/node/bootstrap.hpp
-	rai/node/cli.hpp
-	rai/node/cli.cpp
-	rai/node/common.cpp
-	rai/node/common.hpp
-	rai/node/node.hpp
-	rai/node/node.cpp
-	rai/node/openclwork.cpp
-	rai/node/openclwork.hpp
-	rai/node/rpc.hpp
-	rai/node/rpc.cpp
-	rai/node/testing.hpp
-	rai/node/testing.cpp
-	rai/node/wallet.hpp
-	rai/node/wallet.cpp
-	rai/node/stats.hpp
-	rai/node/stats.cpp
-	rai/node/working.hpp
-	rai/node/xorshift.hpp)
-
+add_subdirectory(rai/node)
 
 SET (ACTIVE_NETWORK rai_live_network CACHE STRING "Selects which network parameters are used")
 set_property (CACHE ACTIVE_NETWORK PROPERTY STRINGS rai_test_network rai_beta_network rai_live_network)
diff --git a/rai/node/CMakeLists.txt b/rai/node/CMakeLists.txt
new file mode 100644
index 00000000..da347d27
--- /dev/null
+++ b/rai/node/CMakeLists.txt
@@ -0,0 +1,54 @@
+if (RAIBLOCKS_SECURE_RPC)
+	set (secure_rpc_sources rpc_secure.cpp rpc_secure.hpp)
+endif ()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	# No opencl
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	set (platform_sources plat/windows/openclapi.cpp)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	set (platform_sources plat/posix/openclapi.cpp)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+	set (platform_sources plat/posix/openclapi.cpp)
+else ()
+	error ("Unknown platform: ${CMAKE_SYSTEM_NAME}")
+endif ()
+
+add_library (node
+	${platform_sources}
+	${secure_rpc_sources}
+	bootstrap.cpp
+	bootstrap.hpp
+	cli.hpp
+	cli.cpp
+	common.cpp
+	common.hpp
+	node.hpp
+	node.cpp
+	openclwork.cpp
+	openclwork.hpp
+	rpc.hpp
+	rpc.cpp
+	testing.hpp
+	testing.cpp
+	wallet.hpp
+	wallet.cpp
+	stats.hpp
+	stats.cpp
+	working.hpp
+	xorshift.hpp)
+
+target_link_libraries (node
+	lmdb
+	ed25519
+	rai_lib
+	libminiupnpc-static
+	argon2
+	Boost::filesystem
+	Boost::log
+	Boost::log_setup
+	Boost::program_options
+	Boost::system
+	Boost::thread
+	Boost::boost
+	)
diff --git a/rai/plat/posix/openclapi.cpp b/rai/node/plat/posix/openclapi.cpp
similarity index 100%
rename from rai/plat/posix/openclapi.cpp
rename to rai/node/plat/posix/openclapi.cpp
diff --git a/rai/plat/windows/openclapi.cpp b/rai/node/plat/windows/openclapi.cpp
similarity index 100%
rename from rai/plat/windows/openclapi.cpp
rename to rai/node/plat/windows/openclapi.cpp