diff --git a/conanfile.py b/conanfile.py index de1412f..037843f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -4,7 +4,7 @@ class QtBasemapPluginConan(ConanFile): name = 'QtBasemapPlugin' - version = '2.0.0-1' + version = '2.0.0-2' license = 'LGPL3' url = 'http://code.qt.io/cgit/qt/qtlocation.git/tree/src/plugins/geoservices/mapbox?h=6.6.0' description = 'Qt GeoServices plugin for basemaps including MapBox' @@ -35,8 +35,9 @@ def build(self): def requirements(self): self.requires('Qt6/[>=6.6.0-3]@pix4d/qt6') - self.requires("xorg/11.7.7-0@pix4d/qt6") - self.requires("xkbcommon/1.6.0-0@pix4d/qt6") + if self.settings.os == 'Linux': + self.requires("xorg/11.7.7-0@pix4d/qt6") + self.requires("xkbcommon/1.6.0-0@pix4d/qt6") def configure(self): del self.settings.compiler.libcxx diff --git a/test_package/conanfile.py b/test_package/conanfile.py index a49e1d3..e43a32f 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -19,8 +19,9 @@ def build(self): def requirements(self): self.requires('Qt6/[>=6.6.0-3]@pix4d/qt6') - self.requires("xorg/11.7.7-0@pix4d/qt6") - self.requires("xkbcommon/1.6.0-0@pix4d/qt6") + if self.settings.os == 'Linux': + self.requires("xorg/11.7.7-0@pix4d/qt6") + self.requires("xkbcommon/1.6.0-0@pix4d/qt6") def test(self): self.run(os.path.join('bin', 'example'), run_environment=True)