diff options
| author | debris <marek.kotewicz@gmail.com> | 2015-09-01 21:30:26 +0800 |
|---|---|---|
| committer | debris <marek.kotewicz@gmail.com> | 2015-09-01 21:30:26 +0800 |
| commit | 619c91321ba226974cbd0db41e6397f50981d55d (patch) | |
| tree | fe7289f28f54d5005889c48237d028f4d0b0fa41 | |
| parent | aad59bd1aaab3b2c3eb5b219a071bec1c5bc6f85 (diff) | |
| download | dexon-solidity-619c91321ba226974cbd0db41e6397f50981d55d.tar.gz dexon-solidity-619c91321ba226974cbd0db41e6397f50981d55d.tar.zst dexon-solidity-619c91321ba226974cbd0db41e6397f50981d55d.zip | |
changes required to compile solidity in a single project
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libsolidity/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | solc/CMakeLists.txt | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 49de37e9..f7477891 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.0.0) -set(ETH_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/../cpp-ethereum-cmake" CACHE PATH "The the path to the cmake directory") +set(ETH_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/../cmake" CACHE PATH "The the path to the cmake directory") list(APPEND CMAKE_MODULE_PATH ${ETH_CMAKE_DIR}) # Set cmake_policies diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index 6e1d70af..9fa35e3b 100644 --- a/libsolidity/CMakeLists.txt +++ b/libsolidity/CMakeLists.txt @@ -1,6 +1,3 @@ -cmake_policy(SET CMP0015 NEW) -set(CMAKE_AUTOMOC OFF) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB") aux_source_directory(. SRC_LIST) @@ -12,7 +9,7 @@ file(GLOB HEADERS "*.h") include_directories(BEFORE ..) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) -eth_use(${EXECUTABLE} REQUIRED Eth::devcore Eth::evmasm) +eth_use(${EXECUTABLE} REQUIRED Dev::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 e9a3446b..2d23dab1 100644 --- a/solc/CMakeLists.txt +++ b/solc/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CMAKE_AUTOMOC OFF) - aux_source_directory(. SRC_LIST) list(REMOVE_ITEM SRC_LIST "./jsonCompiler.cpp") |