Skip to content

Commit

Permalink
(#9190) graphene: bump requirements
Browse files Browse the repository at this point in the history
* graphene: bump requirements

* Update conanfile.py

* graphene: Update Conan conventions

Automatically created by bincrafters-conventions 0.31.0

Co-authored-by: bincrafters-user <bincrafters@gmail.com>
  • Loading branch information
ericLemanissier and bincrafters-user authored Feb 7, 2022
1 parent e58db3a commit ef12514
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
15 changes: 7 additions & 8 deletions recipes/graphene/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class LibnameConan(ConanFile):
name = "graphene"
description = "A thin layer of graphic data types."
topics = ("conan", "graphene")
topics = ("graphic", "canvas", "types")
url = "https://github.com/conan-io/conan-center-index"
homepage = "http://ebassi.github.io/graphene/"
license = "MIT"
Expand Down Expand Up @@ -36,12 +36,12 @@ def config_options(self):
raise ConanInvalidConfiguration("graphene does not support GCC before 5.0")

def build_requirements(self):
self.build_requires("meson/0.57.1")
self.build_requires("pkgconf/1.7.3")
self.build_requires("meson/0.60.2")
self.build_requires("pkgconf/1.7.4")

def requirements(self):
if self.options.with_glib:
self.requires("glib/2.70.0")
self.requires("glib/2.70.1")

def configure(self):
if self.options.shared:
Expand All @@ -50,9 +50,8 @@ def configure(self):
del self.settings.compiler.cppstd

def source(self):
tools.get(**self.conan_data["sources"][self.version])
extracted_dir = self.name + "-" + self.version
os.rename(extracted_dir, self._source_subfolder)
tools.get(**self.conan_data["sources"][self.version],
strip_root=True, destination=self._source_subfolder)

def _configure_meson(self):
meson = Meson(self)
Expand Down Expand Up @@ -81,7 +80,7 @@ def package(self):
with tools.environment_append({"PKG_CONFIG_PATH": self.install_folder}):
meson.install()

if self.settings.compiler == "Visual Studio" and not self.options.shared:
if self.settings.compiler in ["Visual Studio", "msvc"] and not self.options.shared:
with tools.chdir(os.path.join(self.package_folder, "lib")):
if os.path.isfile("libgraphene-1.0.a"):
tools.rename("libgraphene-1.0.a", "graphene-1.0.lib")
Expand Down
2 changes: 1 addition & 1 deletion recipes/graphene/all/test_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ def build(self):
cmake.build()

def test(self):
if not tools.cross_building(self.settings):
if not tools.cross_building(self):
bin_path = os.path.join("bin", "test_package")
self.run(bin_path, run_environment=True)

0 comments on commit ef12514

Please sign in to comment.