From c68fa064f7945a58eba908799678e9c77fb8f3b2 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 29 Nov 2019 11:33:38 +0100 Subject: build: use conan-center packages where possible --- CMakeLists.txt | 5 +---- conanfile.py | 10 ++++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b116b82..504ef2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,10 +34,7 @@ enable_testing() include("Conan") -conan_add_remote(NAME "bincrafters" - URL "https://api.bintray.com/conan/bincrafters/public-conan" -) -conan_add_remote(NAME "bincrafters" +conan_add_remote(NAME "fmorgner" URL "https://api.bintray.com/conan/fmorgner/conan-public" ) conan_cmake_run(CONANFILE "conanfile.py" diff --git a/conanfile.py b/conanfile.py index a24cc33..b4bd13b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -2,6 +2,7 @@ from conans import ConanFile, CMake + class Wanda(ConanFile): name = "wanda" version = "1.0.0" @@ -24,15 +25,12 @@ class Wanda(ConanFile): "src/*", ) requires = ( - "asio/1.12.0@bincrafters/stable", + "asio/1.12.2", "clara/1.1.5@bincrafters/stable", - "spdlog/1.2.1@bincrafters/stable", - "range-v3/0.4.0@ericniebler/stable", "CUTE/2.2.6@fmorgner/stable", + "spdlog/1.4.1", + "range-v3/0.4.0@ericniebler/stable", ) - default_options = { - "asio:standalone": True, - } def configure_cmake(self): cmake = CMake(self) -- cgit v1.2.3