aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGav Wood <g@ethdev.com>2015-02-13 17:13:47 +0800
committerGav Wood <g@ethdev.com>2015-02-13 17:13:47 +0800
commit38cfcab13ef1170ad71a900f62176d39fca5ba7e (patch)
treeabeb70bd0c983ebb5c37700d1ad0454b93e21df4
parent1c3c1f1e5d366ba6d1da03ebaaf03d425037504b (diff)
parentb68f61b07ce22b86537f28249eef27544b58cfbc (diff)
downloaddexon-solidity-38cfcab13ef1170ad71a900f62176d39fca5ba7e.tar
dexon-solidity-38cfcab13ef1170ad71a900f62176d39fca5ba7e.tar.gz
dexon-solidity-38cfcab13ef1170ad71a900f62176d39fca5ba7e.tar.bz2
dexon-solidity-38cfcab13ef1170ad71a900f62176d39fca5ba7e.tar.lz
dexon-solidity-38cfcab13ef1170ad71a900f62176d39fca5ba7e.tar.xz
dexon-solidity-38cfcab13ef1170ad71a900f62176d39fca5ba7e.tar.zst
dexon-solidity-38cfcab13ef1170ad71a900f62176d39fca5ba7e.zip
Merge pull request #1038 from debris/before_jsoncpp
fixed issue with including wrong json/json.h file
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c0b5077..cccc5e16 100644
--- a/CMakeLists.txt
+++ b/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)