From 1f3da99a99a909681ff4fb5a895f1a0fb3195cca Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Mon, 15 Mar 2021 13:54:09 +0200 Subject: Apply *: package filter for 'qt6' option The added filter applies the 'qt6' option for those recipes that actually use it. Recipes in the requires chain (dependencies) that do not define that option are not given this option which may cause and error when building the package(s): ERROR: option 'qt6' doesn't exist Possible options are [] The above error is thrown for some reason when consuming a Conan package via 'conanfile.txt', with or without the 'qt6' option. Change-Id: I8078ba13dd54d30c5a87b3d9f592fbf2734b98e4 Reviewed-by: Kai Koehne --- profiles/qt/linux/6.1.0/qt-6.1.0-gcc-x86_64 | 2 +- profiles/qt/macos/6.1.0/qt-6.1.0-macx-clang | 2 +- profiles/qt/macos/6.1.0/qt-6.1.0-macx-ios | 2 +- profiles/qt/windows/6.1.0/qt-6.1.0-mingw81_64 | 2 +- profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/profiles/qt/linux/6.1.0/qt-6.1.0-gcc-x86_64 b/profiles/qt/linux/6.1.0/qt-6.1.0-gcc-x86_64 index 21dc9e3..b243a81 100644 --- a/profiles/qt/linux/6.1.0/qt-6.1.0-gcc-x86_64 +++ b/profiles/qt/linux/6.1.0/qt-6.1.0-gcc-x86_64 @@ -6,7 +6,7 @@ compiler.libcxx=libstdc++11 build_type=Release [options] -qt6=6.1.0 +*:qt6=6.1.0 [build_requires] [env] QTDIR=%QT_VERSION_PATH%/gcc_64 diff --git a/profiles/qt/macos/6.1.0/qt-6.1.0-macx-clang b/profiles/qt/macos/6.1.0/qt-6.1.0-macx-clang index f65ec67..8dc29e1 100644 --- a/profiles/qt/macos/6.1.0/qt-6.1.0-macx-clang +++ b/profiles/qt/macos/6.1.0/qt-6.1.0-macx-clang @@ -6,7 +6,7 @@ compiler.libcxx=libc++ build_type=Release [options] -qt6=6.1.0 +*:qt6=6.1.0 [build_requires] [env] QTDIR=%QT_VERSION_PATH%/clang_64 diff --git a/profiles/qt/macos/6.1.0/qt-6.1.0-macx-ios b/profiles/qt/macos/6.1.0/qt-6.1.0-macx-ios index a1ebc62..3a99d71 100644 --- a/profiles/qt/macos/6.1.0/qt-6.1.0-macx-ios +++ b/profiles/qt/macos/6.1.0/qt-6.1.0-macx-ios @@ -7,7 +7,7 @@ compiler.libcxx=libc++ build_type=Release [options] -qt6=6.1.0 +*:qt6=6.1.0 [build_requires] [env] QTDIR=%QT_VERSION_PATH%/ios diff --git a/profiles/qt/windows/6.1.0/qt-6.1.0-mingw81_64 b/profiles/qt/windows/6.1.0/qt-6.1.0-mingw81_64 index 6ff812f..cd34e61 100644 --- a/profiles/qt/windows/6.1.0/qt-6.1.0-mingw81_64 +++ b/profiles/qt/windows/6.1.0/qt-6.1.0-mingw81_64 @@ -8,7 +8,7 @@ compiler.libcxx=libstdc++11 build_type=Release [options] -qt6=6.1.0 +*:qt6=6.1.0 [build_requires] [env] CC=gcc diff --git a/profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64 b/profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64 index d812994..de89098 100644 --- a/profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64 +++ b/profiles/qt/windows/6.1.0/qt-6.1.0-msvc2019_64 @@ -5,7 +5,7 @@ compiler.version=16 build_type=Release [options] -qt6=6.1.0 +*:qt6=6.1.0 [build_requires] [env] QTDIR=%QT_VERSION_PATH%\msvc2019_64 -- cgit v1.2.3