diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2021-05-28 10:47:41 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-06-02 21:02:45 +0000 |
| commit | 2a8cc9926e74e27e3b040c159e4237ee76bbaf81 (patch) | |
| tree | 16c54534fc2d24a448b7a160e22b4921cc0fb118 /coin | |
| parent | 01f003f0aa4b7856932d81d6308c4183d6f374bc (diff) | |
Avoid setting DCMAKE_C_COMPILER and DCMAKE_CXX_COMPILER twice
If these values already exist do not add them to configure. This also
allows setting these values from platform configurations
Change-Id: I2f2aea90d91fa3436953e0c4103f0ea204b3564b
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/prepare_building_env.yaml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index 22669d6e50..9217ccf132 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -60,6 +60,15 @@ instructions: condition: property property: host.compiler contains_value: Clang + disable_if: + condition: and + conditions: + - condition: runtime + env_var: CONFIGURE_ARGS + contains_value: "-DCMAKE_C_COMPILER=" + - condition: runtime + env_var: CONFIGURE_ARGS + contains_value: "-DCMAKE_CXX_COMPILER=" # Export TARGET_ARCHITECTURE and WINDOWS_SDK_VERSION for MSVC cross compilation |