From 0520e0f4db7fa8b49b6c294135b689b1fdce4427 Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Fri, 13 Feb 2015 09:03:03 +0100
Subject: [PATCH] fixed issue with including wrong json/json.h file

---
 alethzero/CMakeLists.txt   | 4 ++--
 libsolidity/CMakeLists.txt | 4 ++--
 lllc/CMakeLists.txt        | 4 ++--
 mix/CMakeLists.txt         | 3 ++-
 solc/CMakeLists.txt        | 4 ++--
 test/CMakeLists.txt        | 5 +++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt
index ed2d8fa5e..c18a76c36 100644
--- a/alethzero/CMakeLists.txt
+++ b/alethzero/CMakeLists.txt
@@ -10,9 +10,9 @@ endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 aux_source_directory(. SRC_LIST)
 
-include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
-include_directories(${JSONCPP_INCLUDE_DIRS})
 include_directories(..)
+include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
 
 qt5_wrap_ui(ui_Main.h Main.ui)
 
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 9c0b50775..cccc5e165 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -11,9 +11,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 
 aux_source_directory(. SRC_LIST)
 
-include_directories(${Boost_INCLUDE_DIRS})
-include_directories(${JSONCPP_INCLUDE_DIRS})
 include_directories(..)
+include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
 
 set(EXECUTABLE solidity)
 
diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt
index 5aaca0ccc..2157fea74 100644
--- a/lllc/CMakeLists.txt
+++ b/lllc/CMakeLists.txt
@@ -3,9 +3,9 @@ set(CMAKE_AUTOMOC OFF)
 
 aux_source_directory(. SRC_LIST)
 
-include_directories(${Boost_INCLUDE_DIRS})
-include_directories(${JSONCPP_INCLUDE_DIRS})
 include_directories(..)
+include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
 
 set(EXECUTABLE lllc)
 
diff --git a/mix/CMakeLists.txt b/mix/CMakeLists.txt
index 755f3df04..4390a4eb0 100644
--- a/mix/CMakeLists.txt
+++ b/mix/CMakeLists.txt
@@ -10,8 +10,9 @@ endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 aux_source_directory(. SRC_LIST)
-include_directories(${JSONCPP_INCLUDE_DIRS})
+
 include_directories(..)
+include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
 
 find_package (Qt5WebEngine QUIET)
 qt5_add_resources(UI_RESOURCES res.qrc)
diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt
index 2a7bd7b6d..747effad0 100644
--- a/solc/CMakeLists.txt
+++ b/solc/CMakeLists.txt
@@ -3,9 +3,9 @@ set(CMAKE_AUTOMOC OFF)
 
 aux_source_directory(. SRC_LIST)
 
-include_directories(${Boost_INCLUDE_DIRS})
-include_directories(${JSONCPP_INCLUDE_DIRS})
 include_directories(..)
+include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
 
 set(EXECUTABLE solc)
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ab8afcd70..6ba07f280 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,11 +4,12 @@ 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(${Boost_INCLUDE_DIRS})
 include_directories(${CRYPTOPP_INCLUDE_DIRS})
-include_directories(${JSONCPP_INCLUDE_DIRS})
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
-include_directories(..)
+
 
 file(GLOB HEADERS "*.h")
 add_executable(testeth ${SRC_LIST} ${HEADERS})