Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix has for 0.18.0 release. #407

Merged
merged 12 commits into from
Apr 4, 2022
Merged

Fix has for 0.18.0 release. #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d4d0792
set current version
czoido Jan 16, 2020
4396be5
Merge pull request #196 from czoido/merge_0.15_to_master
czoido Jan 16, 2020
29ad682
Merge branch 'release/0.16'
czoido Feb 23, 2021
a3a0916
Merge branch 'release/0.16'
czoido Feb 25, 2021
f8fd649
cmake-conan version 0.17
czoido Nov 19, 2021
91c15d3
Merge pull request #370 from conan-io/release/0.17
czoido Nov 19, 2021
11e2192
Merge branch 'release/0.18'
czoido Mar 29, 2022
c69d1ea
version 0.19.0-dev
czoido Mar 30, 2022
0430792
Fix has for 0.18.0 release.
AlphaCluster Apr 1, 2022
8f14457
revert changes
czoido Apr 4, 2022
5b8dbb9
0.18.1 version
czoido Apr 4, 2022
7e3c1fa
add 0.18.1
czoido Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion conan.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down