sha512sum/nameof_module
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean-up ci

Browse source
This commit is contained in:
neargye 2019-08-20 17:12:32 +05:00
parent 7e974384b2
commit 31301aca91
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.appveyor.yml
View file

@ -31,7 +31,7 @@ install:
- set PATH=%PATH%;%PYTHON%/Scripts/ - set PATH=%PATH%;%PYTHON%/Scripts/
- pip.exe install conan --upgrade - pip.exe install conan --upgrade
- pip.exe install conan_package_tools bincrafters_package_tools - pip.exe install conan_package_tools bincrafters_package_tools
- conan user # It creates the conan data directory - conan user
test_script: test_script:
- python .ci/build.py - python .ci/build.py

4
conanfile.py
View file

@ -39,7 +39,7 @@ class NameofConan(ConanFile):
} }
@property @property
def supports_string_view(self): def supports_compiler(self):
compiler = str(self.settings.compiler) compiler = str(self.settings.compiler)
version = Version(str(self.settings.compiler.version)) version = Version(str(self.settings.compiler.version))
if compiler == 'Visual Studio' and version >= Version('15'): 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') self.build_requires.append('Catch2/2.9.1@catchorg/stable')
def configure(self): def configure(self):
if not self.supports_string_view: if not self.supports_compiler:
raise ConanInvalidConfiguration('The specified compiler must support C++17') raise ConanInvalidConfiguration('The specified compiler must support C++17')
def configure_cmake(self): def configure_cmake(self):