[DO-1345] fixed windows packages (!16)
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/16 Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team> Co-committed-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.team>
This commit is contained in:
committed by
Aleksandr Vodyanov
parent
3759e1163f
commit
a82e89a1bc
@@ -100,10 +100,10 @@ class HarfbuzzConan(ConanFile):
|
||||
)
|
||||
|
||||
def build_requirements(self):
|
||||
# self.tool_requires("meson/1.4.0")
|
||||
self.tool_requires("meson/[>=1.4.0<2]")
|
||||
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
|
||||
self.tool_requires("pkgconf/[>=2.1.0]")
|
||||
if self.options.with_glib:
|
||||
if self.options.with_glib and (self.settings.os != "Windows" or self.settings.compiler != "gcc"):
|
||||
self.tool_requires("glib/<host_version>")
|
||||
if self.settings.os == "Macos":
|
||||
# Ensure that the gettext we use at build time is compatible
|
||||
|
||||
Reference in New Issue
Block a user