From f00b8a539957faa983dca605981522dafcaede4d Mon Sep 17 00:00:00 2001
From: Wesley Shillingford <wezrule@hotmail.com>
Date: Thu, 9 May 2019 06:40:25 +0100
Subject: [PATCH] No longer use bin & lib sub-folders in the installers (#1969)

* Remove bin & lib sub-folders

* Upgrade CMake version for travis/mac
---
 .travis.yml                   |  2 +-
 CMakeLists.txt                |  6 +++---
 nano/lib/CMakeLists.txt       |  8 --------
 nano/nano_node/CMakeLists.txt |  4 +---
 nano/nano_rpc/CMakeLists.txt  | 12 ++++++------
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bcb719f..155f1ec0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ jobs:
       os: osx
       compiler: clang
       before_install:
-        - brew update && brew install qt5 && brew cask install xquartz && brew install rust;
+        - brew update && brew install qt5 && brew cask install xquartz && brew install rust && brew upgrade cmake;
       install:
         - brew install ccache;
         - export PATH="/usr/local/opt/ccache/libexec:$PATH";
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1657942a..c15f62b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -415,6 +415,8 @@ if (NANO_GUI OR RAIBLOCKS_GUI)
 	if (APPLE)
 		CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/Info.plist.in ${CMAKE_SOURCE_DIR}/Info.plist @ONLY)
 		install (TARGETS nano_wallet DESTINATION Nano.app/Contents/MacOS)
+		install (TARGETS nano_node DESTINATION Nano.app/Contents/MacOS)
+		install (TARGETS nano_rpc DESTINATION Nano.app/Contents/MacOS)
 		install (FILES Info.plist DESTINATION Nano.app/Contents)
 		install (FILES qt.conf DESTINATION Nano.app/Contents/Resources)
 		install (DIRECTORY ${Qt5_DIR}/../../QtCore.framework DESTINATION Nano.app/Contents/Frameworks)
@@ -452,9 +454,7 @@ if (NANO_GUI OR RAIBLOCKS_GUI)
 		install (FILES ${Qt5WindowsPlugin} DESTINATION platforms)
 	else ()
 		install(TARGETS nano_wallet
-				RUNTIME DESTINATION bin
-				LIBRARY DESTINATION lib
-				ARCHIVE DESTINATION lib
+				RUNTIME DESTINATION .
 		)
 	endif ()
 endif ()
diff --git a/nano/lib/CMakeLists.txt b/nano/lib/CMakeLists.txt
index 31b5c86a..8b9ed53e 100644
--- a/nano/lib/CMakeLists.txt
+++ b/nano/lib/CMakeLists.txt
@@ -53,11 +53,3 @@ target_compile_definitions(nano_lib
 	PUBLIC
 		-DACTIVE_NETWORK=${ACTIVE_NETWORK}
 )
-
-if ((NANO_GUI OR RAIBLOCKS_GUI) AND NOT APPLE)
-	install(TARGETS nano_lib
-			RUNTIME DESTINATION bin
-			LIBRARY DESTINATION lib
-			ARCHIVE DESTINATION lib
-	)
-endif()
diff --git a/nano/nano_node/CMakeLists.txt b/nano/nano_node/CMakeLists.txt
index 5d80c402..3d102947 100644
--- a/nano/nano_node/CMakeLists.txt
+++ b/nano/nano_node/CMakeLists.txt
@@ -26,8 +26,6 @@ set_target_properties (nano_node
 
 if ((NANO_GUI OR RAIBLOCKS_GUI) AND NOT APPLE)
 	install(TARGETS nano_node
-			RUNTIME DESTINATION bin
-			LIBRARY DESTINATION lib
-			ARCHIVE DESTINATION lib
+			RUNTIME DESTINATION .
 	)
 endif()
diff --git a/nano/nano_rpc/CMakeLists.txt b/nano/nano_rpc/CMakeLists.txt
index 9c22d5cb..ee222c63 100644
--- a/nano/nano_rpc/CMakeLists.txt
+++ b/nano/nano_rpc/CMakeLists.txt
@@ -19,9 +19,9 @@ target_compile_definitions(nano_rpc
 		-DNANO_VERSION_MAJOR=${CPACK_PACKAGE_VERSION_MAJOR}
 		-DNANO_VERSION_MINOR=${CPACK_PACKAGE_VERSION_MINOR}
 		-DNANO_VERSION_PATCH=${CPACK_PACKAGE_VERSION_PATCH})
-		
-install(TARGETS nano_rpc
-			RUNTIME DESTINATION bin
-			LIBRARY DESTINATION lib
-			ARCHIVE DESTINATION lib
-)
+
+if ((NANO_GUI OR RAIBLOCKS_GUI) AND NOT APPLE)
+	install(TARGETS nano_rpc
+			RUNTIME DESTINATION .
+	)
+endif()