From 28c887c96cd9f8f908101209f01070119b39eb4d Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Mon, 5 May 2014 16:49:56 +0100
Subject: [PATCH] Remove build cruft.

---
 CMakeLists.txt             | 12 ++++++------
 eth/CMakeLists.txt         |  4 ----
 libethcore/CMakeLists.txt  |  5 -----
 libethereum/CMakeLists.txt |  5 -----
 neth/CMakeLists.txt        |  4 ----
 secp256k1/CMakeLists.txt   |  3 ---
 test/CMakeLists.txt        |  4 ----
 7 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40bfc087e..27af0779b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,21 +233,21 @@ else ()
 
 endif()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	link_directories(/usr/local/lib)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
 # Generate header file containing useful build information
 add_custom_target(BuildInfo.h ALL COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/BuildInfo.sh ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BUILD_TYPE} ${ETH_BUILD_PLATFORM})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	link_directories(/usr/local/lib)
+	include_directories(/usr/local/include)
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
 add_subdirectory(secp256k1)
 add_subdirectory(libethcore)
 add_subdirectory(libethereum)
 add_subdirectory(test)
 add_subdirectory(eth)
-if ("${TARGET_PLATFORM}" STREQUAL "w64")
-else ()
+if (NOT ("${TARGET_PLATFORM}" STREQUAL "w64"))
 	add_subdirectory(neth)
 endif ()
 if (NOT HEADLESS)
diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt
index 0a3177466..5417ec500 100644
--- a/eth/CMakeLists.txt
+++ b/eth/CMakeLists.txt
@@ -44,10 +44,6 @@ else ()
 	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
 endif ()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	include_directories(/usr/local/include)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
 target_link_libraries(${EXECUTABLE} ethereum)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt
index 3234b0d99..8bfa96e06 100644
--- a/libethcore/CMakeLists.txt
+++ b/libethcore/CMakeLists.txt
@@ -61,11 +61,6 @@ else ()
 	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
 endif ()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	link_directories(/usr/local/lib)
-	include_directories(/usr/local/include)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
 message("Installation path: ${CMAKE_INSTALL_PREFIX}")
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
diff --git a/libethereum/CMakeLists.txt b/libethereum/CMakeLists.txt
index df8f9cbde..0d6ca8905 100644
--- a/libethereum/CMakeLists.txt
+++ b/libethereum/CMakeLists.txt
@@ -61,11 +61,6 @@ else ()
 	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
 endif ()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	link_directories(/usr/local/lib)
-	include_directories(/usr/local/include)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
 message("Installation path: ${CMAKE_INSTALL_PREFIX}")
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
diff --git a/neth/CMakeLists.txt b/neth/CMakeLists.txt
index ab4a975ef..14fbbe117 100644
--- a/neth/CMakeLists.txt
+++ b/neth/CMakeLists.txt
@@ -39,10 +39,6 @@ else ()
 	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
 endif ()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	include_directories(/usr/local/include)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
 target_link_libraries(${EXECUTABLE} ethereum)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS})
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
diff --git a/secp256k1/CMakeLists.txt b/secp256k1/CMakeLists.txt
index ca4fde94e..0c9e87c4e 100644
--- a/secp256k1/CMakeLists.txt
+++ b/secp256k1/CMakeLists.txt
@@ -26,6 +26,3 @@ endif()
 
 target_link_libraries(secp256k1 gmp)
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	include_directories(/usr/local/include)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7fb86dbdb..be6e1f92d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -31,10 +31,6 @@ else ()
 	target_link_libraries(testeth ${CMAKE_THREAD_LIBS_INIT})
 endif ()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-	include_directories(/usr/local/include)
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-
 target_link_libraries(testeth ethereum)
 target_link_libraries(testeth secp256k1)
 target_link_libraries(testeth miniupnpc)