diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-05-22 17:01:13 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-06-12 11:16:11 +0000 |
| commit | ce11410caa6b2ba94a88a1368b379df96839f865 (patch) | |
| tree | 171e4f7dea3020d6d90ad4c55f206d9a2a142a8c | |
| parent | b4e5b6493680185dcb9bcda08b3743696233f29e (diff) | |
Use ninja as default builder
That allows us to skip all the madness of choosing between
make/nmake/jom.
In addition it is actually faster to build with ninja, then other
tools.
Change-Id: I31049a292495800606cede6f15011d97af7c3e41
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CMake Build Bot
| -rw-r--r-- | coin/module_config.yaml | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 5290784a19..ef0269cc52 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -11,31 +11,20 @@ build_instructions: - type: ChangeDirectory directory: "{{.BuildDir}}" - type: ExecuteCommand - command: cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} {{.SourceDir}} + command: cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -GNinja {{.SourceDir}} maxTimeInSeconds: 6000 maxTimeBetweenOutput: 120 userMessageOnFailure: > Failed to call cmake. Contact Liang then. + - type: EnvironmentVariable + variableName: DESTDIR + variableValue: "{{.InstallRoot}}" - type: ExecuteCommand - command: make DESTDIR={{.InstallRoot}} install + command: ninja install maxTimeInSeconds: 6000 maxTimeBetweenOutput: 120 userMessageOnFailure: > - Failed to call make install. Contact Liang then. - disable_if: - condition: property - property: host.os - equals_value: Windows - - type: ExecuteCommand - command: jom DESTDIR={{.InstallRoot}} install - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 120 - userMessageOnFailure: > - Failed to call jom install. Contact Liang then. - disable_if: - condition: property - property: host.os - not_equals_value: Windows + Failed to build sources. In the current state bug can be everywhere. Contact Liang first. - type: SignPackage disable_if: condition: property |