fixed #1022

10 years ago · dd0744e8a3
25 changed files with 27 additions and 26 deletions
--- a/alethzero/CMakeLists.txt
+++ b/alethzero/CMakeLists.txt
@ -10,8 +10,8 @@ endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 aux_source_directory(. SRC_LIST)

-include_directories(..)
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(BEFORE ..)
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})

 qt5_wrap_ui(ui_Main.h Main.ui)
--- a/eth/CMakeLists.txt
+++ b/eth/CMakeLists.txt
@ -3,9 +3,9 @@ set(CMAKE_AUTOMOC OFF)

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
-include_directories(..)

 set(EXECUTABLE eth)

--- a/exp/CMakeLists.txt
+++ b/exp/CMakeLists.txt
@ -3,8 +3,8 @@ set(CMAKE_AUTOMOC OFF)

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 include_directories(${LEVELDB_INCLUDE_DIRS})
-include_directories(..)

 set(EXECUTABLE exp)

--- a/libdevcore/CMakeLists.txt
+++ b/libdevcore/CMakeLists.txt
@ -12,8 +12,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
-include_directories(..)

 set(EXECUTABLE devcore)

--- a/libdevcrypto/CMakeLists.txt
+++ b/libdevcrypto/CMakeLists.txt
@ -9,10 +9,10 @@ set(CMAKE_AUTOMOC OFF)

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..) 
 include_directories(${Boost_INCLUDE_DIRS})
 include_directories(${CRYPTOPP_INCLUDE_DIRS})
 include_directories(${LEVELDB_INCLUDE_DIRS})
-include_directories(..) 

 set(EXECUTABLE devcrypto)

--- a/libethcore/CMakeLists.txt
+++ b/libethcore/CMakeLists.txt
@ -9,8 +9,8 @@ set(CMAKE_AUTOMOC OFF)

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
-include_directories(..)

 set(EXECUTABLE ethcore)

--- a/libethereum/CMakeLists.txt
+++ b/libethereum/CMakeLists.txt
@ -11,8 +11,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 include_directories(${LEVELDB_INCLUDE_DIRS})
-include_directories(..)

 set(EXECUTABLE ethereum)

--- a/libethereumx/CMakeLists.txt
+++ b/libethereumx/CMakeLists.txt
@ -4,7 +4,8 @@ set(CMAKE_AUTOMOC OFF)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")

 aux_source_directory(. SRC_LIST)
-include_directories(..)
+
+include_directories(BEFORE ..)

 set(EXECUTABLE ethereumx)

--- a/libevm/CMakeLists.txt
+++ b/libevm/CMakeLists.txt
@ -13,8 +13,8 @@ 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(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
-include_directories(..)

 set(EXECUTABLE evm)

--- a/libevmcore/CMakeLists.txt
+++ b/libevmcore/CMakeLists.txt
@ -11,8 +11,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
-include_directories(..)

 set(EXECUTABLE evmcore)

--- a/liblll/CMakeLists.txt
+++ b/liblll/CMakeLists.txt
@ -11,8 +11,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
-include_directories(..)

 set(EXECUTABLE lll)

--- a/libnatspec/CMakeLists.txt
+++ b/libnatspec/CMakeLists.txt
@ -13,7 +13,7 @@ set(CMAKE_AUTOMOC OFF)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 aux_source_directory(. SRC_LIST)

-include_directories(..)
+include_directories(BEFORE ..)

 set(EXECUTABLE natspec)

--- a/libp2p/CMakeLists.txt
+++ b/libp2p/CMakeLists.txt
@ -11,6 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 # 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})
@ -18,7 +19,6 @@ include_directories(${LEVELDB_INCLUDE_DIRS})
 if (MINIUPNPC_FOUND)
 	include_directories(${MINIUPNPC_INCLUDE_DIRS})
 endif()
-include_directories(..)

 set(EXECUTABLE p2p)

--- a/libserpent/CMakeLists.txt
+++ b/libserpent/CMakeLists.txt
@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")

 aux_source_directory(. SRC_LIST)

-include_directories(..)
+include_directories(BEFORE ..)

 set(EXECUTABLE serpent)

--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@ -11,8 +11,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")

 aux_source_directory(. SRC_LIST)

-include_directories(..)
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})

 set(EXECUTABLE solidity)
--- a/libweb3jsonrpc/CMakeLists.txt
+++ b/libweb3jsonrpc/CMakeLists.txt
@ -9,8 +9,8 @@ set(CMAKE_AUTOMOC OFF)

 aux_source_directory(. SRC_LIST)

-include_directories(..)
-include_directories(${JSONCPP_INCLUDE_DIRS})
+include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(BEFORE ..)
 include_directories(${MHD_INCLUDE_DIRS})
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
 include_directories(${LEVELDB_INCLUDE_DIRS})
--- a/libwebthree/CMakeLists.txt
+++ b/libwebthree/CMakeLists.txt
@ -11,8 +11,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 include_directories(${LEVELDB_INCLUDE_DIRS})
-include_directories(..)

 set(EXECUTABLE webthree)

--- a/libwhisper/CMakeLists.txt
+++ b/libwhisper/CMakeLists.txt
@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")

 aux_source_directory(. SRC_LIST)

-include_directories(..)
+include_directories(BEFORE ..)
 include_directories(${LEVELDB_INCLUDE_DIRS})

 set(EXECUTABLE whisper)
--- a/lllc/CMakeLists.txt
+++ b/lllc/CMakeLists.txt
@ -3,8 +3,8 @@ set(CMAKE_AUTOMOC OFF)

 aux_source_directory(. SRC_LIST)

-include_directories(..)
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})

 set(EXECUTABLE lllc)
--- a/mix/CMakeLists.txt
+++ b/mix/CMakeLists.txt
@ -11,8 +11,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)

 aux_source_directory(. SRC_LIST)

-include_directories(..)
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(BEFORE ..)

 find_package (Qt5WebEngine QUIET)
 qt5_add_resources(UI_RESOURCES res.qrc)
--- a/neth/CMakeLists.txt
+++ b/neth/CMakeLists.txt
@ -2,9 +2,9 @@ cmake_policy(SET CMP0015 NEW)

 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
 include_directories(${LEVELDB_INCLUDE_DIRS})
-include_directories(..)

 set(EXECUTABLE neth)

--- a/sc/CMakeLists.txt
+++ b/sc/CMakeLists.txt
@ -2,7 +2,7 @@ cmake_policy(SET CMP0015 NEW)

 aux_source_directory(. SRC_LIST)

-include_directories(..)
+include_directories(BEFORE ..)

 set(EXECUTABLE sc)

--- a/solc/CMakeLists.txt
+++ b/solc/CMakeLists.txt
@ -3,8 +3,8 @@ set(CMAKE_AUTOMOC OFF)

 aux_source_directory(. SRC_LIST)

-include_directories(..)
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})

 set(EXECUTABLE solc)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -4,8 +4,8 @@ aux_source_directory(. SRC_LIST)
 list(REMOVE_ITEM SRC_LIST "./createRandomTest.cpp")
 list(REMOVE_ITEM SRC_LIST "./checkRandomTest.cpp")

-include_directories(..)
 include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
 include_directories(${CRYPTOPP_INCLUDE_DIRS})
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
--- a/third/CMakeLists.txt
+++ b/third/CMakeLists.txt
@ -10,8 +10,8 @@ endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 aux_source_directory(. SRC_LIST)

+include_directories(BEFORE ..)
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
-include_directories(..)

 qt5_wrap_ui(ui_Main.h Main.ui)