From df0f64a0920eab35033b17cc1104aa8b37af204f Mon Sep 17 00:00:00 2001 From: Nicholas Omann Date: Mon, 4 Apr 2022 09:05:46 -0500 Subject: [PATCH] Fix has for 0.18.0 release. (#407) * set current version * cmake-conan version 0.17 * version 0.19.0-dev * Fix has for 0.18.0 release. * revert changes * 0.18.1 version * add 0.18.1 Co-authored-by: czoido --- CMakeLists.txt | 2 +- README.md | 5 ++--- conan.cmake | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ab047c2..2451e039 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ add_definitions("-std=c++11") # 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.18.0/conan.cmake" +# file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" # "${CMAKE_BINARY_DIR}/conan.cmake" # TLS_VERIFY ON) # endif() diff --git a/README.md b/README.md index ebb3796f..c0417899 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The branches in this repo are: You probably want to use a tagged release to ensure controlled upgrades. You can just clone or grab the *conan.cmake* file and put in in your project. -Or it can be used in this way. Note the ``0.18.0`` tag in the URL, change it to point to your desired release: +Or it can be used in this way. Note the ``0.18.1`` tag in the URL, change it to point to your desired release: ```cmake @@ -29,9 +29,8 @@ add_definitions("-std=c++11") 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.18.0/conan.cmake" + file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake" - EXPECTED_HASH SHA256=396e16d0f5eabdc6a14afddbcfff62a54a7ee75c6da23f32f7a31bc85db23484 TLS_VERIFY ON) endif() diff --git a/conan.cmake b/conan.cmake index 0f2f562a..4f5f67e7 100644 --- a/conan.cmake +++ b/conan.cmake @@ -33,7 +33,7 @@ # but it is only necessary on the end-user side. It is not necessary to create conan # packages, in fact it shouldn't be use for that. Check the project documentation. -# version: 0.18.0 +# version: 0.18.1 include(CMakeParseArguments)