From 06a552eab0cb81dc50aebbfb330770519241f042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 13 Jun 2019 14:23:44 +0200 Subject: Port ICC specific instructions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- coin/module_config.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'coin/module_config.yaml') 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. -- cgit v1.2.3