From 3cb32187978d401b01e079d86605f5a7ae1477e8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 8 Dec 2022 16:30:05 +0100 Subject: [PATCH] coin: Build qmake examples in non-qtbase repos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit COIN_CONFIGURE_ARGS would only contain -make examples in qtbase builds. In other repos it would use values like NON_QTBASE_CONFIGURE_ARGS, which would not contain -make examples. Check CONFIGURE_ARGS and TARGET_CONFIGURE_ARGS which are guaranteed to contain -make examples when building any repo. Amends 440438092bc6276399cbb1bd9425227898221587 Change-Id: I9bf086f8104da85ed8ece335a45c6628ea591f2a Reviewed-by: Alexey Edelev Reviewed-by: Jörg Bornemann --- .../qmake_examples/build_qmake_examples_instructions.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml b/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml index dc3417a05cc..bbc31f7676a 100644 --- a/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml +++ b/coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml @@ -21,7 +21,11 @@ instructions: - condition: runtime env_var: COIN_CMAKE_ARGS contains_value: "QT_BUILD_EXAMPLES=ON" - # covers all cases for UseConfigure configs + # host case - condition: runtime - env_var: COIN_CONFIGURE_ARGS + env_var: CONFIGURE_ARGS + contains_value: "-make examples" + # target case + - condition: runtime + env_var: TARGET_CONFIGURE_ARGS contains_value: "-make examples"