From 8101595cebd5c1c7805600dab021caef471724e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Wed, 29 Jun 2022 00:13:44 +0200 Subject: [PATCH] chore: Update CMake to use latest cmake-conan/0.18.1 [ci skip] --- CMakeLists.txt | 2 +- conanfile.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1af6bf85c1..fd94577e89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,7 @@ if(BOOST_GIL_USE_CONAN) # Download automatically, you can also just copy the conan.cmake file if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake") message(STATUS "Boost.GIL: Downloading conan.cmake from https://github.com/conan-io/cmake-conan") - file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/v0.15/conan.cmake" + file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake") endif() diff --git a/conanfile.txt b/conanfile.txt index 94558d7b19..90916e500e 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2018-2021 Mateusz Loskot +# Copyright (c) 2018-2022 Mateusz Loskot # # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at @@ -11,4 +11,5 @@ libpng/1.6.37 libtiff/4.1.0 [generators] -cmake +CMakeDeps +CMakeToolchain