diff options
| author | debris <marek.kotewicz@gmail.com> | 2015-08-27 20:28:31 +0800 |
|---|---|---|
| committer | debris <marek.kotewicz@gmail.com> | 2015-08-27 20:28:31 +0800 |
| commit | 1741e89c09fb60fc34928d2359ece19c577da6d7 (patch) | |
| tree | 8d17f535e766b26a11cee88ed81df112f459c17e | |
| parent | 66552f46a617a4881ad1578d9cdcadf3635d60f2 (diff) | |
| download | dexon-solidity-1741e89c09fb60fc34928d2359ece19c577da6d7.tar.gz dexon-solidity-1741e89c09fb60fc34928d2359ece19c577da6d7.tar.zst dexon-solidity-1741e89c09fb60fc34928d2359ece19c577da6d7.zip | |
client refactor
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | libsolidity/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | solc/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 6 |
4 files changed, 7 insertions, 16 deletions
@@ -28,4 +28,7 @@ *.app # Build directory -build/
\ No newline at end of file +build/ + +# vim stuff +*.swp diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index fa1fd233..6e1d70af 100644 --- a/libsolidity/CMakeLists.txt +++ b/libsolidity/CMakeLists.txt @@ -10,12 +10,9 @@ set(EXECUTABLE solidity) file(GLOB HEADERS "*.h") include_directories(BEFORE ..) -include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS}) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) -eth_use(${EXECUTABLE} REQUIRED EthCore) - -target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES}) +eth_use(${EXECUTABLE} REQUIRED Eth::devcore Eth::evmasm) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt index 73dc4b6f..e9a3446b 100644 --- a/solc/CMakeLists.txt +++ b/solc/CMakeLists.txt @@ -1,21 +1,16 @@ -cmake_policy(SET CMP0015 NEW) set(CMAKE_AUTOMOC OFF) aux_source_directory(. SRC_LIST) list(REMOVE_ITEM SRC_LIST "./jsonCompiler.cpp") -include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS}) include_directories(BEFORE ..) -include_directories(${Boost_INCLUDE_DIRS}) set(EXECUTABLE solc) file(GLOB HEADERS "*.h") add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) -eth_use(${EXECUTABLE} REQUIRED EthCore) - -target_link_libraries(${EXECUTABLE} solidity) +eth_use(${EXECUTABLE} REQUIRED Solidity) target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES}) if (APPLE) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 25120c89..9c6e2944 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -44,14 +44,10 @@ file(GLOB HEADERS "*.h") set(EXECUTABLE soltest) add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) -eth_use(${EXECUTABLE} REQUIRED EthCore) +eth_use(${EXECUTABLE} REQUIRED Solidity Eth::ethereum) include_directories(BEFORE ..) -include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS}) target_link_libraries(${EXECUTABLE} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) -target_link_libraries(${EXECUTABLE} ${ETH_ETHEREUM_LIBRARY}) -target_link_libraries(${EXECUTABLE} ${ETH_ETHCORE_LIBRARY}) -target_link_libraries(${EXECUTABLE} solidity) enable_testing() set(CTEST_OUTPUT_ON_FAILURE TRUE) |