aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2015-04-21 17:45:33 +0800
committerchriseth <c@ethdev.com>2015-04-21 17:46:11 +0800
commit02121683f5f43cb3c547521fb4a2642f637f246f (patch)
treee7bbfb580082eac8b606b29e13444f00f80f0273 /CMakeLists.txt
parente375612a7ecbab9ad33a6a40df1c722a82e07630 (diff)
downloaddexon-solidity-02121683f5f43cb3c547521fb4a2642f637f246f.tar.gz
dexon-solidity-02121683f5f43cb3c547521fb4a2642f637f246f.tar.zst
dexon-solidity-02121683f5f43cb3c547521fb4a2642f637f246f.zip
Removed (and added) some #ifs (but removed more than I added).
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt11
1 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b46ab06e..a97bb86f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,19 +23,18 @@ add_subdirectory(libdevcrypto)
add_subdirectory(libethcore)
add_subdirectory(libethereum)
add_subdirectory(libevm)
-add_subdirectory(libevmcore)
add_subdirectory(libnatspec)
add_subdirectory(libp2p)
-add_subdirectory(libsolidity)
+if (SOLIDITY)
+ add_subdirectory(libsolidity)
+endif ()
+if (JSONRPC)
add_subdirectory(libweb3jsonrpc)
+endif ()
add_subdirectory(libwhisper)
set(SRC_LIST ${SRC_LIST} ${SRC})
-if (NOT JSONRPC)
- list(REMOVE_ITEM SRC_LIST "libweb3jsonrpc/./AccountHolder.cpp")
-endif()
-
include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS})
include_directories(BEFORE ..)
include_directories(${Boost_INCLUDE_DIRS})