diff options
| author | Gav Wood <g@ethdev.com> | 2015-02-13 17:13:47 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-02-13 17:13:47 +0800 |
| commit | 344f262abff1149ae0b0d8e1588b119cd6b3889e (patch) | |
| tree | 142d1d3cbb9db2f00c6de21312b679015e58f213 | |
| parent | 48f6bda44b0a8335ed3cbd072fc8b6f30d2c6c4c (diff) | |
| parent | 1a9e9a5f6b72764d30dfe5a61f1dff5d0f99fe22 (diff) | |
| download | dexon-solidity-344f262abff1149ae0b0d8e1588b119cd6b3889e.tar dexon-solidity-344f262abff1149ae0b0d8e1588b119cd6b3889e.tar.gz dexon-solidity-344f262abff1149ae0b0d8e1588b119cd6b3889e.tar.bz2 dexon-solidity-344f262abff1149ae0b0d8e1588b119cd6b3889e.tar.lz dexon-solidity-344f262abff1149ae0b0d8e1588b119cd6b3889e.tar.xz dexon-solidity-344f262abff1149ae0b0d8e1588b119cd6b3889e.tar.zst dexon-solidity-344f262abff1149ae0b0d8e1588b119cd6b3889e.zip | |
Merge pull request #1038 from debris/before_jsoncpp
fixed issue with including wrong json/json.h file
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ab8afcd7..6ba07f28 100644 --- a/CMakeLists.txt +++ b/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}) |