diff --git a/recipes/jfalcou-eve/all/conandata.yml b/recipes/jfalcou-eve/all/conandata.yml index 64b8f0d735894..1968e85720cbe 100644 --- a/recipes/jfalcou-eve/all/conandata.yml +++ b/recipes/jfalcou-eve/all/conandata.yml @@ -1,7 +1,7 @@ sources: - "cci.20210823": - url: "https://github.com/jfalcou/eve/archive/30e7a7f6bcc5cf524a6c2cc624234148eee847be.tar.gz" - sha256: "c267135f7215197ef6859b2aa1c5b6a7fc45ca8333933beda56c96b0d0400ef1" "v2021.10.0": url: "https://github.com/jfalcou/eve/archive/refs/tags/v2021.10.0.tar.gz" sha256: "580c40a8244039a700b93ea49fb0affc1c8d3c100eb6dc66368e101753f51e5c" + "v2022.03.0": + url: "https://github.com/jfalcou/eve/archive/refs/tags/v2022.03.0.tar.gz" + sha256: "8bf9faea516806e7dd468e778dcedc81c51f0b2c6a70b9c75987ce12bb759911" diff --git a/recipes/jfalcou-eve/all/conanfile.py b/recipes/jfalcou-eve/all/conanfile.py index e4befa8d6daea..552f767f67158 100644 --- a/recipes/jfalcou-eve/all/conanfile.py +++ b/recipes/jfalcou-eve/all/conanfile.py @@ -1,10 +1,9 @@ -from conans import ConanFile, CMake, tools +from conan import ConanFile, tools +from conan.tools.scm import Version from conans.errors import ConanInvalidConfiguration -import os required_conan_version = ">=1.33.0" - class JfalcouEveConan(ConanFile): name = "jfalcou-eve" description = ("Expressive Velocity Engine - reimplementation of the old " @@ -28,18 +27,19 @@ def _min_cppstd(self): @property def _compilers_minimum_version(self): - return { - "gcc": "10.2", - "Visual Studio": "16.9", - "clang": "12", - "apple-clang": "13", - } + return {"gcc": "11", + "Visual Studio": "16.9", + "clang": "13", + "apple-clang": "13", + } def validate(self): if self.settings.compiler.get_safe("cppstd"): - tools.check_min_cppstd(self, self._min_cppstd) + tools.build.check_min_cppstd(self, self._min_cppstd) if self.settings.compiler == "Visual Studio": raise ConanInvalidConfiguration("EVE does not support MSVC yet (https://github.com/jfalcou/eve/issues/1022).") + if self.settings.compiler == "apple-clang": + raise ConanInvalidConfiguration("EVE does not support apple Clang due to an incomplete libcpp.") def lazy_lt_semver(v1, v2): lv1 = [int(v) for v in v1.split(".")] @@ -57,7 +57,7 @@ def package_id(self): self.info.header_only() def source(self): - tools.get(**self.conan_data["sources"][self.version], strip_root=True, + tools.files.get(self, **self.conan_data["sources"][self.version], strip_root=True, destination=self._source_subfolder) def package(self): diff --git a/recipes/jfalcou-eve/config.yml b/recipes/jfalcou-eve/config.yml index 0f62a77059506..0190125da41b4 100644 --- a/recipes/jfalcou-eve/config.yml +++ b/recipes/jfalcou-eve/config.yml @@ -1,5 +1,5 @@ versions: - "cci.20210823": - folder: all "v2021.10.0": folder: all + "v2022.03.0": + folder: all