diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-12-08 16:30:05 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-12-09 10:51:54 +0100 |
| commit | 3cb32187978d401b01e079d86605f5a7ae1477e8 (patch) | |
| tree | 58de3412506283426e8cea37e6b000c6e199aad0 /coin | |
| parent | 85b941f4251bb5207db65efc9ccdd1f5586c8d11 (diff) | |
coin: Build qmake examples in non-qtbase repos
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 <alexey.edelev@qt.io>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/qmake_examples/build_qmake_examples_instructions.yaml | 8 |
1 files 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 dc3417a05c..bbc31f7676 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" |