Skip to content

Commit

Permalink
(#9785) Update jfalcou-eve requirements as of v2022.03.0
Browse files Browse the repository at this point in the history
* Update EVE recipe to take care of the new clang requirement

* Update g++ minimum version

* Add config folder rules

* Try to deactivate Apple Clang support

* Missing conandata info

* What about not comittign before coffee

* Changes for compiler version

* Update recipes/jfalcou-eve/all/conanfile.py

* Remove outlier recipe cci.*

* Removed spurrious config

* Conan v2 fixes

* Fixed Version issue

Co-authored-by: SSE4 <tomskside@gmail.com>
  • Loading branch information
jfalcou and SSE4 authored Aug 9, 2022
1 parent ca38b0f commit 6de10d6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions recipes/jfalcou-eve/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -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"
22 changes: 11 additions & 11 deletions recipes/jfalcou-eve/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -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 "
Expand All @@ -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(".")]
Expand All @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions recipes/jfalcou-eve/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
versions:
"cci.20210823":
folder: all
"v2021.10.0":
folder: all
"v2022.03.0":
folder: all

0 comments on commit 6de10d6

Please sign in to comment.