diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2024-02-01 13:48:11 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2024-02-05 16:36:17 +0100 |
| commit | 05fcd6170651059e73702d2d7d48210e3ecce51d (patch) | |
| tree | f1612064496a43afb79941a7928c835bcf20f9cb | |
| parent | b9562efce074b8a5018745131df693c2a6bde83e (diff) | |
coin: Cleanup module_config
Change-Id: Ib2391f39276742ef00f95f7b0071f30a16ffeea9
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index a0592f06..2e3b412b 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -18,34 +18,14 @@ instructions: - type: EnvironmentVariable variableName: BUILD_DOCUMENTATION variableValue: "1" - - type: AppendToEnvironmentVariable - variableName: NON_QTBASE_CONFIGURE_ARGS - variableValue: " -DPython3_EXECUTABLE={{.Env.PYTHON3_EXECUTABLE}} -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}} -DFEATURE_ifcodegen=ON" - disable_if: - condition: property - property: features - contains_value: UseConfigure - - type: AppendToEnvironmentVariable - variableName: NON_QTBASE_TARGET_CONFIGURE_ARGS - variableValue: " -DPython3_EXECUTABLE={{.Env.PYTHON3_EXECUTABLE}} -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}} -DFEATURE_ifcodegen=ON" - disable_if: - condition: property - property: features - contains_value: UseConfigure + # Detect python3 and make ifcodegen mandatory for all configs - type: AppendToEnvironmentVariable variableName: NON_QTBASE_CMAKE_ARGS variableValue: " -DPython3_EXECUTABLE={{.Env.PYTHON3_EXECUTABLE}} -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}} -DFEATURE_ifcodegen=ON" - enable_if: - condition: property - property: features - contains_value: UseConfigure - type: AppendToEnvironmentVariable variableName: NON_QTBASE_TARGET_CMAKE_ARGS variableValue: " -DPython3_EXECUTABLE={{.Env.PYTHON3_EXECUTABLE}} -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}} -DFEATURE_ifcodegen=ON" - enable_if: - condition: property - property: features - contains_value: UseConfigure + # Enable compiled ifcodegen on all packaging configs - type: AppendToEnvironmentVariable variableName: NON_QTBASE_CONFIGURE_ARGS variableValue: " -compiled-ifcodegen" |