Remove build cruft.

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)

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})

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 )

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 )

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})

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")

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)