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>bb10
parent
01f003f0aa
commit
2a8cc9926e
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue