From 1fcf85ae0ac4bb825dcd37f10c3f15473417c8d4 Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Fri, 12 Dec 2014 14:45:49 +0100
Subject: [PATCH] removed unnecessary miniupnpc links

---
 eth/CMakeLists.txt            | 4 ----
 exp/CMakeLists.txt            | 4 ----
 libethereum/CMakeLists.txt    | 4 ----
 libevm/CMakeLists.txt         | 2 ++
 libp2p/CMakeLists.txt         | 8 ++++----
 libweb3jsonrpc/CMakeLists.txt | 4 ----
 libwebthree/CMakeLists.txt    | 4 ----
 libwhisper/CMakeLists.txt     | 4 ----
 neth/CMakeLists.txt           | 4 ----
 9 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt
index 9996d1170..739c2991c 100644
--- a/eth/CMakeLists.txt
+++ b/eth/CMakeLists.txt
@@ -17,10 +17,6 @@ add_dependencies(${EXECUTABLE} BuildInfo.h)
 target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARY_RELEASE})
 target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARY_RELEASE})
 
-if (MINIUPNPC_FOUND)
-	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARIES})
-endif()
-
 if (READLINE_FOUND)
 	target_link_libraries(${EXECUTABLE} ${READLINE_LIBRARIES})
 endif()
diff --git a/exp/CMakeLists.txt b/exp/CMakeLists.txt
index 98eae7baf..49bbbf16b 100644
--- a/exp/CMakeLists.txt
+++ b/exp/CMakeLists.txt
@@ -12,10 +12,6 @@ add_executable(${EXECUTABLE} ${SRC_LIST})
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 
-if (MINIUPNPC_FOUND)
-	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARIES})
-endif()
-
 target_link_libraries(${EXECUTABLE} ethereum)
 target_link_libraries(${EXECUTABLE} p2p)
 target_link_libraries(${EXECUTABLE} gmp)
diff --git a/libethereum/CMakeLists.txt b/libethereum/CMakeLists.txt
index c13f2ba18..792ed0cf1 100644
--- a/libethereum/CMakeLists.txt
+++ b/libethereum/CMakeLists.txt
@@ -27,10 +27,6 @@ endif()
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARY_RELEASE})
 
-if (MINIUPNPC_FOUND)
-	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARIES})
-endif()
-
 target_link_libraries(${EXECUTABLE} evm)
 target_link_libraries(${EXECUTABLE} lll)
 target_link_libraries(${EXECUTABLE} whisper)
diff --git a/libevm/CMakeLists.txt b/libevm/CMakeLists.txt
index a260b442c..96b8f9ade 100644
--- a/libevm/CMakeLists.txt
+++ b/libevm/CMakeLists.txt
@@ -11,6 +11,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 
 aux_source_directory(. SRC_LIST)
 
+# we may not use it in libevm, but one of our dependecies is including boost in header file
+# and windows is failing to build without that
 include_directories(${Boost_INCLUDE_DIRS})
 include_directories(..)
 
diff --git a/libp2p/CMakeLists.txt b/libp2p/CMakeLists.txt
index c94ebebbd..50ca138f4 100644
--- a/libp2p/CMakeLists.txt
+++ b/libp2p/CMakeLists.txt
@@ -11,7 +11,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 
 aux_source_directory(. SRC_LIST)
 
+# we may not use it in libp2p, but one of our dependecies is including leveldb in header file
+# and windows is failing to build without that
 include_directories(${LEVELDB_INCLUDE_DIRS})
+include_directories(${MINIUPNPC_INCLUDE_DIRS})
 include_directories(..)
 
 set(EXECUTABLE p2p)
@@ -24,15 +27,12 @@ else()
 	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
-
-if(MINIUPNPC_FOUND)
+if (MINIUPNPC_FOUND)
 	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARIES})
 endif()
 
 target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} devcore)
-target_link_libraries(${EXECUTABLE} secp256k1)
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
diff --git a/libweb3jsonrpc/CMakeLists.txt b/libweb3jsonrpc/CMakeLists.txt
index 5068ede56..f371024e6 100644
--- a/libweb3jsonrpc/CMakeLists.txt
+++ b/libweb3jsonrpc/CMakeLists.txt
@@ -27,10 +27,6 @@ target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
 target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARIES})
 
-if (MINIUPNPC_FOUND)
-	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARIES})
-endif()
-
 target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} secp256k1)
 target_link_libraries(${EXECUTABLE} solidity)
diff --git a/libwebthree/CMakeLists.txt b/libwebthree/CMakeLists.txt
index 587d81493..1d8f23918 100644
--- a/libwebthree/CMakeLists.txt
+++ b/libwebthree/CMakeLists.txt
@@ -26,10 +26,6 @@ endif()
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 
-if (MINIUPNPC_FOUND)
-	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARIES})
-endif()
-
 target_link_libraries(${EXECUTABLE} ethereum)
 target_link_libraries(${EXECUTABLE} evm)
 target_link_libraries(${EXECUTABLE} lll)
diff --git a/libwhisper/CMakeLists.txt b/libwhisper/CMakeLists.txt
index f51af33b7..79879922e 100644
--- a/libwhisper/CMakeLists.txt
+++ b/libwhisper/CMakeLists.txt
@@ -26,10 +26,6 @@ endif()
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 
-if (MINIUPNPC_FOUND)
-	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARIES})
-endif()
-
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} devcrypto)
 target_link_libraries(${EXECUTABLE} devcore)
diff --git a/neth/CMakeLists.txt b/neth/CMakeLists.txt
index 63619fd84..4db3d2cf4 100644
--- a/neth/CMakeLists.txt
+++ b/neth/CMakeLists.txt
@@ -14,10 +14,6 @@ add_dependencies(${EXECUTABLE} BuildInfo.h)
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES})
 
-if (MINIUPNPC_FOUND)
-target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARIES})
-endif()
-
 if (JSONRPC)
 	target_link_libraries(${EXECUTABLE} web3jsonrpc)
 endif()