Skip to content

Commit a23b1ce

Browse files
authored
Merge pull request #5 from StephanKa/feature/fix-conan-cmake-version
Feature/fix conan cmake version
2 parents 9ca9a5d + a74b32a commit a23b1ce

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

cmake/Conan.cmake

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@ macro(run_conan)
22
# Download automatically, you can also just copy the conan.cmake file
33
if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
44
message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
5-
file(DOWNLOAD "https://github.com/conan-io/cmake-conan/raw/v0.15/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake")
5+
file(DOWNLOAD "https://github.com/conan-io/cmake-conan/raw/0.18.1/conan.cmake" "${CMAKE_BINARY_DIR}/conan.cmake" TLS_VERIFY ON)
66
endif()
77

88
include(${CMAKE_BINARY_DIR}/conan.cmake)
99

10-
conan_add_remote(
11-
NAME
12-
bincrafters
13-
URL
14-
https://api.bintray.com/conan/bincrafters/public-conan)
15-
1610
conan_cmake_run(
1711
REQUIRES
1812
${CONAN_EXTRA_REQUIRES}

0 commit comments

Comments
 (0)