qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add the missing CMAKE_MAKE_PROGRAM definition for tests 

Since tests now use vcpkg for dependency lookup, we need to highjack
the CMAKE_MAKE_PROGRAM the same way we do this for Qt module builds.

Amends 3a629595eb

Change-Id: I4427257e9c44bf2abd971f662bf136673364081e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2025-08-06 15:42:46 +02:00
parent 6926f2ee26
commit ec29a6d797
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
coin/instructions/prepare_building_env.yaml
View File

@ -15,12 +15,26 @@ instructions:
- type: AppendToEnvironmentVariable
variableName: COMMON_NON_QTBASE_CMAKE_ARGS
variableValue: " -DCMAKE_MAKE_PROGRAM={{.Env.NINJA_EXECUTABLE}}"
- type: AppendToEnvironmentVariable
variableName: COMMON_TEST_CMAKE_ARGS
variableValue: " -DCMAKE_MAKE_PROGRAM={{.Env.NINJA_EXECUTABLE}}"
disable_if:
condition: property
property: target.osVersion
in_values: [IOS_ANY]
- type: AppendToEnvironmentVariable
variableName: COMMON_TARGET_CMAKE_ARGS
variableValue: " -DCMAKE_MAKE_PROGRAM={{.Env.NINJA_EXECUTABLE}}"
- type: AppendToEnvironmentVariable
variableName: COMMON_NON_QTBASE_TARGET_CMAKE_ARGS
variableValue: " -DCMAKE_MAKE_PROGRAM={{.Env.NINJA_EXECUTABLE}}"
- type: AppendToEnvironmentVariable
variableName: COMMON_TARGET_TEST_CMAKE_ARGS
variableValue: " -DCMAKE_MAKE_PROGRAM={{.Env.NINJA_EXECUTABLE}}"
disable_if:
condition: property
property: target.osVersion
in_values: [IOS_ANY]
enable_if:
condition: runtime
env_var: NINJA_EXECUTABLE