Skip to content

Commit

Permalink
[fontconfig] fix test v1 package
Browse files Browse the repository at this point in the history
  • Loading branch information
planetmarshall committed Oct 29, 2022
1 parent 067da2d commit 3ee058a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
11 changes: 2 additions & 9 deletions recipes/fontconfig/meson/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ class FontconfigConan(ConanFile):
"fPIC": True,
}

@property
def _settings_build(self):
return getattr(self, "settings_build", self.settings)

def export_sources(self):
export_conandata_patches(self)

Expand All @@ -62,14 +58,11 @@ def requirements(self):
if self.settings.os == "Linux":
self.requires("libuuid/1.0.3")

def validate(self):
if is_msvc(self) and Version(self.version) < "2.13.93":
raise ConanInvalidConfiguration("fontconfig does not support Visual Studio for versions < 2.13.93.")

def build_requirements(self):
self.tool_requires("gperf/3.1")
self.tool_requires("pkgconf/1.9.3")
self.tool_requires("meson/0.63.3")
if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
self.tool_requires("pkgconf/1.9.3")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True, destination=self.source_folder)
Expand Down
2 changes: 1 addition & 1 deletion recipes/fontconfig/meson/test_v1_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class TestPackageConan(ConanFile):
settings = "os", "arch", "compiler", "build_type"
generators = "cmake", "cmake_find_package"
generators = "cmake", "cmake_find_package_multi"

def build(self):
cmake = CMake(self)
Expand Down

0 comments on commit 3ee058a

Please sign in to comment.