From cc32b20cc3bfeceb7e6d9b4a47cf6a897d7f7758 Mon Sep 17 00:00:00 2001 From: Iason Nikolas Date: Sat, 31 Dec 2022 20:29:02 +0200 Subject: [PATCH 1/2] Update Conan.cmake Update to the latest available version to overcome some windows related problems during build. --- src/Conan.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Conan.cmake b/src/Conan.cmake index ac41ac17..1b14a099 100644 --- a/src/Conan.cmake +++ b/src/Conan.cmake @@ -6,7 +6,7 @@ macro(run_conan) if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan") file( - DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.17.0/conan.cmake" + DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake" EXPECTED_HASH SHA256=3bef79da16c2e031dc429e1dac87a08b9226418b300ce004cc125a82687baeef # TLS_VERIFY ON # fails on some systems From f25b193b6b9104813e8c3bc7330c09fde2479890 Mon Sep 17 00:00:00 2001 From: Iason Nikolas Date: Sun, 1 Jan 2023 19:40:48 +0200 Subject: [PATCH 2/2] Fix hash of cmake.conan version 18.1 --- src/Conan.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Conan.cmake b/src/Conan.cmake index 1b14a099..7b1e26ba 100644 --- a/src/Conan.cmake +++ b/src/Conan.cmake @@ -8,7 +8,7 @@ macro(run_conan) file( DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake" - EXPECTED_HASH SHA256=3bef79da16c2e031dc429e1dac87a08b9226418b300ce004cc125a82687baeef + EXPECTED_HASH SHA256=5cdb3042632da3efff558924eecefd580a0e786863a857ca097c3d1d43df5dcd # TLS_VERIFY ON # fails on some systems ) endif()