diff options
| -rw-r--r-- | libevmasm/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libevmasm/ConstantOptimiser.cpp | 6 | ||||
| -rw-r--r-- | libevmasm/Version.cpp | 2 | ||||
| -rw-r--r-- | liblll/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lllc/CMakeLists.txt | 1 |
5 files changed, 7 insertions, 5 deletions
diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt index 1accb8ea..424644ca 100644 --- a/libevmasm/CMakeLists.txt +++ b/libevmasm/CMakeLists.txt @@ -6,6 +6,7 @@ set(EXECUTABLE evmasm) file(GLOB HEADERS "*.h") +include_directories(BEFORE ..) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) eth_use(${EXECUTABLE} REQUIRED Eth::evmcore) diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp index 917bcd58..766371b0 100644 --- a/libevmasm/ConstantOptimiser.cpp +++ b/libevmasm/ConstantOptimiser.cpp @@ -19,9 +19,9 @@ * @date 2015 */ -#include <solidity/libevmasm/ConstantOptimiser.h> -#include <solidity/libevmasm/Assembly.h> -#include <solidity/libevmasm/GasMeter.h> +#include <libevmasm/ConstantOptimiser.h> +#include <libevmasm/Assembly.h> +#include <libevmasm/GasMeter.h> using namespace std; using namespace dev; using namespace dev::eth; diff --git a/libevmasm/Version.cpp b/libevmasm/Version.cpp index 8d8b25d4..c1379848 100644 --- a/libevmasm/Version.cpp +++ b/libevmasm/Version.cpp @@ -23,7 +23,7 @@ #include <string> #include <ethereum/BuildInfo.h> #include <libdevcore/Common.h> -#include <libsolidity/libevmasm/Version.h> +#include <libevmasm/Version.h> using namespace dev; using namespace std; diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt index 0b468d7a..734f6901 100644 --- a/liblll/CMakeLists.txt +++ b/liblll/CMakeLists.txt @@ -6,13 +6,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB") aux_source_directory(. SRC_LIST) #include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS}) -include_directories(BEFORE ..) #include_directories(${Boost_INCLUDE_DIRS}) set(EXECUTABLE lll) file(GLOB HEADERS "*.h") +include_directories(BEFORE ..) add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) eth_use(${EXECUTABLE} REQUIRED Eth::evmasm) diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt index 3a5b9c55..a9432432 100644 --- a/lllc/CMakeLists.txt +++ b/lllc/CMakeLists.txt @@ -3,6 +3,7 @@ aux_source_directory(. SRC_LIST) set(EXECUTABLE lllc) file(GLOB HEADERS "*.h") +include_directories(BEFORE ..) add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) eth_use(${EXECUTABLE} REQUIRED Eth::lll Dev::buildinfo) |