From 0b17831fa0f45f2b018886ba9905fe61e48d2e89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Sat, 10 Nov 2018 23:01:48 +0100 Subject: [PATCH 1/2] CMake: Load Hunter only when building with EVMC_TESTING --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0008c1c..fd42b77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) From 8228d9acef117da5bd742374c682b63701fc9b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Sat, 10 Nov 2018 23:09:27 +0100 Subject: [PATCH 2/2] Add changelog entry about improved Hunter loading --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2290d7..9b9ed63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)] @@ -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