diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-19 16:13:20 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-21 12:50:49 +0000 |
| commit | d0183527d4f784a2217f98e3e4295bc2468ea62d (patch) | |
| tree | 6743e8210d480746d3f1c2c7687d2f7397803f5f /coin | |
| parent | 1c4510cfc4c020d54e3c1c52e187b31b67e3a5fb (diff) | |
Change cmake generator selection mechanism
By using the new environment variable for the generator selection
introduced in 3.15, we can later select the visual studio generator once
the qtbase build is fixed. This will simplify the VS selection code in
this file and allow getting rid of the ENV_PREFIX and .bat file.
Change-Id: I9f76b5714450ffa60b496aef0ce5a0c21e843bef
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/module_config.yaml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 210da62495..868a106d7e 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -140,6 +140,9 @@ build_instructions: directory: "{{.SourceDir}}" - type: ChangeDirectory directory: "{{.BuildDir}}" + - type: EnvironmentVariable + variableName: CMAKE_GENERATOR + variableValue: Ninja - *icc_export_variables - *export_target_architecture_and_sdk - *find_path_to_compiler @@ -169,7 +172,7 @@ build_instructions: property: host.os equals_value: Windows - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DBUILD_TESTING=OFF -GNinja {{.SourceDir}}" + command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DBUILD_TESTING=OFF {{.SourceDir}}" maxTimeInSeconds: 6000 maxTimeBetweenOutput: 120 userMessageOnFailure: > @@ -219,7 +222,7 @@ build_instructions: - type: ChangeDirectory directory: "{{.SourceDir}}/tests" - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_PREFIX_PATH:PATH={{.InstallDir}} -GNinja {{.SourceDir}}/tests" + command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_PREFIX_PATH:PATH={{.InstallDir}} {{.SourceDir}}/tests" maxTimeInSeconds: 6000 maxTimeBetweenOutput: 120 userMessageOnFailure: > |