From 31301aca917c06de974cb46bc5993edc6b4cb5d3 Mon Sep 17 00:00:00 2001 From: neargye Date: Tue, 20 Aug 2019 17:12:32 +0500 Subject: [PATCH] clean-up ci --- .appveyor.yml | 2 +- conanfile.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index f01b146..07e20ac 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -31,7 +31,7 @@ install: - set PATH=%PATH%;%PYTHON%/Scripts/ - pip.exe install conan --upgrade - pip.exe install conan_package_tools bincrafters_package_tools - - conan user # It creates the conan data directory + - conan user test_script: - python .ci/build.py diff --git a/conanfile.py b/conanfile.py index aed0a2c..0c4fb43 100644 --- a/conanfile.py +++ b/conanfile.py @@ -39,7 +39,7 @@ class NameofConan(ConanFile): } @property - def supports_string_view(self): + def supports_compiler(self): compiler = str(self.settings.compiler) version = Version(str(self.settings.compiler.version)) if compiler == 'Visual Studio' and version >= Version('15'): @@ -59,7 +59,7 @@ class NameofConan(ConanFile): self.build_requires.append('Catch2/2.9.1@catchorg/stable') def configure(self): - if not self.supports_string_view: + if not self.supports_compiler: raise ConanInvalidConfiguration('The specified compiler must support C++17') def configure_cmake(self):