From 01c20c79c92048d8bf22a7aca325a94e2d42d4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Tue, 14 May 2019 12:30:45 +0200 Subject: [PATCH] cmake: Add intx dependency --- cmake/Hunter/init.cmake | 16 +++++++--------- src/CMakeLists.txt | 5 ++++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cmake/Hunter/init.cmake b/cmake/Hunter/init.cmake index 43c6f542e..2c62c59df 100644 --- a/cmake/Hunter/init.cmake +++ b/cmake/Hunter/init.cmake @@ -1,12 +1,10 @@ -if(EVMC_TESTING OR EVMC_TEST_TOOLS) - set(HUNTER_CONFIGURATION_TYPES Release - CACHE STRING "Build type of the Hunter packages") +set(HUNTER_CONFIGURATION_TYPES Release + CACHE STRING "Build type of the Hunter packages") - include(HunterGate) +include(HunterGate) - HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.23.169.tar.gz" - SHA1 "60de9f275143ab38df559986c04e3726683e7de7" - ) -endif() +HunterGate( + URL "https://github.com/ruslo/hunter/archive/v0.23.169.tar.gz" + SHA1 "60de9f275143ab38df559986c04e3726683e7de7" +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 48fd5594f..f558e2eae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,8 @@ find_package(Threads REQUIRED) +hunter_add_package(intx) +find_package(intx CONFIG REQUIRED) + set(hera_include_dir ${PROJECT_SOURCE_DIR}/include) get_filename_component(evmc_include_dir .. ABSOLUTE) @@ -33,7 +36,7 @@ endif() target_include_directories(hera PUBLIC $$ ) -target_link_libraries(hera PUBLIC evmc::evmc PRIVATE hera-buildinfo evmc::instructions) +target_link_libraries(hera PUBLIC evmc::evmc PRIVATE hera-buildinfo evmc::instructions intx::intx) if(NOT WIN32) if(CMAKE_COMPILER_IS_GNUCXX) set_target_properties(hera PROPERTIES LINK_FLAGS "-Wl,--no-undefined")