diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-06-13 14:23:44 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-06-17 09:21:20 +0000 |
| commit | 06a552eab0cb81dc50aebbfb330770519241f042 (patch) | |
| tree | fae18647d5b8a9d72ad67b51a7029776898925a7 /coin/module_config.yaml | |
| parent | d48940044852111b2ee8f7a69a3faa750032bf44 (diff) | |
Port ICC specific instructions
Coin implicitly was exporting some variables if ICC was used.
This patch is just a first step to enable ICC in CI. To make
it really working one would need to fix the QtBase code and
enable ICC in qt5 repository.
Change-Id: I2fca19ff10d7390fa013f511f167c0c1c2fba427
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'coin/module_config.yaml')
| -rw-r--r-- | coin/module_config.yaml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 12f53d2d02..f15e07d498 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -119,6 +119,20 @@ windows_specific_instructions: property: host.compiler equals_value: MSVC2019 +icc_specific_instructions: &icc_export_variables + type: Group + instructions: + - type: EnvironmentVariable + variableName: LD_LIBRARY_PATH + variableValue: "{{.Env.ICC64_18_LDLP}}" + - type: PrependToEnvironmentVariable + variableName: PATH + variableValue: "{{.Env.ICC64_18_PATH}}" + enable_if: + condition: property + property: host.compiler + equals_value: ICC_18 + build_instructions: - type: MakeDirectory directory: .git @@ -126,6 +140,7 @@ build_instructions: directory: "{{.SourceDir}}" - type: ChangeDirectory directory: "{{.BuildDir}}" + - *icc_export_variables - *export_target_architecture_and_sdk - *find_path_to_compiler # With MSVC we need setup the environment before every subprocess call. |