diff options
| author | chriseth <chris@ethereum.org> | 2017-09-27 18:24:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 18:24:30 +0800 |
| commit | b19c2f26cf2678266b4ff90406fab3b5b6130818 (patch) | |
| tree | a6349672b244f114c795f0e2895f5f37d76640dd | |
| parent | 9c62647f19541f875590ff61bca9042e1139f9da (diff) | |
| parent | ffd440ccffabebf161af7cc602fd0beb56350cda (diff) | |
| download | dexon-solidity-b19c2f26cf2678266b4ff90406fab3b5b6130818.tar.gz dexon-solidity-b19c2f26cf2678266b4ff90406fab3b5b6130818.tar.zst dexon-solidity-b19c2f26cf2678266b4ff90406fab3b5b6130818.zip | |
Merge pull request #2972 from ethereum/cmake-cleanup-include-paths
CMake: Cleanup include paths
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/EthBuildInfo.cmake | 2 | ||||
| -rw-r--r-- | cmake/EthDependencies.cmake | 7 | ||||
| -rw-r--r-- | libevmasm/CMakeLists.txt | 2 |
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) |