Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake: Load Hunter only when building with EVMC_TESTING #169

Merged
merged 2 commits into from
Nov 10, 2018
Merged

CMake: Load Hunter only when building with EVMC_TESTING #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b17831
CMake: Load Hunter only when building with EVMC_TESTING
chfast Nov 10, 2018
8228d9a
Add changelog entry about improved Hunter loading
chfast Nov 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [6.0.1] - unreleased

- Fixed: [[#169](https://github.com/ethereum/evmc/pull/169)]
Integration of EVMC as a CMake subproject is easier because
Hunter is not loaded unless building tests (`EVMC_TESTING=ON`) is requested.

## [6.0.0] - 2018-10-24

- Added: [[#116](https://github.com/ethereum/evmc/pull/116)]
Expand Down Expand Up @@ -79,6 +85,7 @@
Constantinople: Storage status is reported back from `evmc_set_storage()`.


[6.0.1]: https://github.com/ethereum/evmc/compare/v6.0.0...release/6.0
[6.0.0]: https://github.com/ethereum/evmc/releases/tag/v6.0.0
[5.2.0]: https://github.com/ethereum/evmc/releases/tag/v5.2.0
[5.1.0]: https://github.com/ethereum/evmc/releases/tag/v5.1.0
Expand Down
8 changes: 5 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ include(cmake/cable/bootstrap.cmake)
include(CableBuildType)
include(CableCompilerSettings)
include(CMakePackageConfigHelpers)
include(HunterGate)
include(GNUInstallDirs)
include(defaults/HunterCacheServers)

include(HunterConfig)
if(EVMC_TESTING)
include(HunterGate)
include(HunterConfig)
include(defaults/HunterCacheServers)
endif()

project(evmc)
set(PROJECT_VERSION 6.0.0)
Expand Down