aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaweł Bylica <chfast@gmail.com>2017-09-27 04:44:57 +0800
committerPaweł Bylica <chfast@gmail.com>2017-09-27 04:44:57 +0800
commitffd440ccffabebf161af7cc602fd0beb56350cda (patch)
treeae51fe015b67f3df69ab868a152c18a7e685a662
parent6db13311dd6d9e9ebb10f6f5b34c5b326f69b390 (diff)
downloaddexon-solidity-ffd440ccffabebf161af7cc602fd0beb56350cda.tar
dexon-solidity-ffd440ccffabebf161af7cc602fd0beb56350cda.tar.gz
dexon-solidity-ffd440ccffabebf161af7cc602fd0beb56350cda.tar.bz2
dexon-solidity-ffd440ccffabebf161af7cc602fd0beb56350cda.tar.lz
dexon-solidity-ffd440ccffabebf161af7cc602fd0beb56350cda.tar.xz
dexon-solidity-ffd440ccffabebf161af7cc602fd0beb56350cda.tar.zst
dexon-solidity-ffd440ccffabebf161af7cc602fd0beb56350cda.zip
CMake: Cleanup include paths
-rw-r--r--CMakeLists.txt2
-rw-r--r--cmake/EthBuildInfo.cmake2
-rw-r--r--cmake/EthDependencies.cmake7
-rw-r--r--libevmasm/CMakeLists.txt2
4 files changed, 3 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f71cedc..537a9521 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ string(REGEX MATCHALL ".." LICENSE_TEXT "${LICENSE_TEXT}")
string(REGEX REPLACE ";" ",\n\t0x" LICENSE_TEXT "${LICENSE_TEXT}")
set(LICENSE_TEXT "0x${LICENSE_TEXT}")
-configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" "license.h")
+configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/license.h)
include(EthOptions)
configure_project(TESTS)
diff --git a/cmake/EthBuildInfo.cmake b/cmake/EthBuildInfo.cmake
index 1f70d371..cae3e5ce 100644
--- a/cmake/EthBuildInfo.cmake
+++ b/cmake/EthBuildInfo.cmake
@@ -39,5 +39,5 @@ function(create_build_info NAME)
-DPROJECT_VERSION="${PROJECT_VERSION}"
-P "${ETH_SCRIPTS_DIR}/buildinfo.cmake"
)
- include_directories(BEFORE ${PROJECT_BINARY_DIR})
+ include_directories("${PROJECT_BINARY_DIR}/include")
endfunction()
diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake
index 1204f186..233ac22a 100644
--- a/cmake/EthDependencies.cmake
+++ b/cmake/EthDependencies.cmake
@@ -48,10 +48,3 @@ option(Boost_USE_STATIC_LIBS "Link Boost statically" ON)
find_package(Boost 1.54.0 QUIET REQUIRED COMPONENTS regex filesystem unit_test_framework program_options system)
eth_show_dependency(Boost boost)
-
-if (APPLE)
- link_directories(/usr/local/lib)
- include_directories(/usr/local/include)
-endif()
-
-include_directories(BEFORE "${PROJECT_BINARY_DIR}/include")
diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
index 5c945c7d..cfd59dff 100644
--- a/libevmasm/CMakeLists.txt
+++ b/libevmasm/CMakeLists.txt
@@ -2,4 +2,4 @@ file(GLOB sources "*.cpp")
file(GLOB headers "*.h")
add_library(evmasm ${sources} ${headers})
-target_link_libraries(evmasm PUBLIC devcore jsoncpp)
+target_link_libraries(evmasm PUBLIC jsoncpp devcore)