diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2024-01-26 17:20:54 +0100 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2024-01-26 17:29:30 +0100 |
| commit | 584b07d5664e23341c255a5fc09acf62392ad2ba (patch) | |
| tree | 4bb4f3b00432dfeccebeaee2f70c494b4f1aa419 | |
| parent | 5a49d1c8adb0bc2be18806d563ea23af7266c727 (diff) | |
coin: Use the PYTHON3_EXECUTABLE env variable when specified
This helps to use a specific python3 version when multiple versions
exist in the same path e.g. /usr/bin
Pick-to: 6.7
Change-Id: I3f390955580c01d3fbad9ff5ba8a3dc4e070622b
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 5daf850f..a0592f06 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -20,28 +20,28 @@ instructions: variableValue: "1" - type: AppendToEnvironmentVariable variableName: NON_QTBASE_CONFIGURE_ARGS - variableValue: " -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}} -DFEATURE_ifcodegen=ON" + 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_ROOT_DIR={{.Env.PYTHON3_PATH}} -DFEATURE_ifcodegen=ON" + 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_CMAKE_ARGS - variableValue: " -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}} -DFEATURE_ifcodegen=ON" + 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_ROOT_DIR={{.Env.PYTHON3_PATH}} -DFEATURE_ifcodegen=ON" + variableValue: " -DPython3_EXECUTABLE={{.Env.PYTHON3_EXECUTABLE}} -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}} -DFEATURE_ifcodegen=ON" enable_if: condition: property property: features |