chore: Update CMake to use latest cmake-conan/0.18.1 [ci skip]

boostorg · Jun 28, 2022 · 8101595 · 8101595
1 parent 4dbf35a
commit 8101595
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2021 Mateusz Loskot <mateusz at loskot dot net>
+# Copyright (c) 2018-2022 Mateusz Loskot <mateusz at loskot dot net>
 #
 # 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