Merge pull request #238 from ethereum/build

chfast · web-flow · commit 44e95c45bbe1 · 2020-06-22T11:50:26.000+02:00
Build changes
diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake
@@ -1,5 +1,5 @@
 # evmone: Fast Ethereum Virtual Machine implementation
-# Copyright 2018-2019 The evmone Authors.
+# Copyright 2018-2020 The evmone Authors.
 # Licensed under the Apache License, Version 2.0.
 
 hunter_config(
@@ -8,11 +8,3 @@ hunter_config(
     URL https://github.com/chfast/intx/archive/v0.4.0.tar.gz
     SHA1 8a2a0b0efa64899db972166a9b3568a6984c61bc
 )
-
-hunter_config(
-    GTest
-    VERSION 1.8.1
-    URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz
-    SHA1 152b849610d91a9dfa1401293f43230c2e0c33f8
-    CMAKE_ARGS BUILD_GMOCK=OFF gtest_force_shared_crt=ON
-)
diff --git a/cmake/Hunter/init.cmake b/cmake/Hunter/init.cmake
@@ -1,13 +1,13 @@
 # evmone: Fast Ethereum Virtual Machine implementation
-# Copyright 2018-2019 The evmone Authors.
+# Copyright 2018-2020 The evmone Authors.
 # Licensed under the Apache License, Version 2.0.
 
 set(HUNTER_CONFIGURATION_TYPES Release CACHE STRING "Build type of Hunter packages")
 
 include(HunterGate)
 
 HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.23.190.tar.gz"
-    SHA1 "bc7da329d2493201de28f0c2a5fcd4de1415c477"
+    URL https://github.com/cpp-pm/hunter/archive/v0.23.239.tar.gz
+    SHA1 135567a8493ab3499187bce1f2a8df9b449febf3
     LOCAL
 )
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,12 +1,15 @@
 # evmone: Fast Ethereum Virtual Machine implementation
-# Copyright 2019 The evmone Authors.
+# Copyright 2019-2020 The evmone Authors.
 # Licensed under the Apache License, Version 2.0.
 
 include(GoogleTest)
 include(${PROJECT_SOURCE_DIR}/evmc/cmake/EVMC.cmake)
 
 set(evmone_private_include_dir ${PROJECT_SOURCE_DIR}/lib)
 
+hunter_add_package(benchmark)
+find_package(benchmark CONFIG REQUIRED)
+
 add_subdirectory(utils)
 add_subdirectory(bench)
 add_subdirectory(internal_benchmarks)
diff --git a/test/bench/CMakeLists.txt b/test/bench/CMakeLists.txt
@@ -1,12 +1,9 @@
 # evmone: Fast Ethereum Virtual Machine implementation
-# Copyright 2019 The evmone Authors.
+# Copyright 2019-2020 The evmone Authors.
 # Licensed under the Apache License, Version 2.0.
 
 include(CheckIncludeFileCXX)
 
-hunter_add_package(benchmark)
-find_package(benchmark CONFIG REQUIRED)
-
 add_executable(evmone-bench bench.cpp)
 
 target_include_directories(evmone-bench PRIVATE ${evmone_private_include_dir})
diff --git a/test/internal_benchmarks/CMakeLists.txt b/test/internal_benchmarks/CMakeLists.txt
@@ -1,10 +1,7 @@
 # evmone: Fast Ethereum Virtual Machine implementation
-# Copyright 2019 The evmone Authors.
+# Copyright 2019-2020 The evmone Authors.
 # Licensed under the Apache License, Version 2.0.
 
-hunter_add_package(benchmark)
-find_package(benchmark CONFIG REQUIRED)
-
 add_executable(
     evmone-bench-internal
     find_jumpdest_bench.cpp
