From a5b963c6389b728086e19ff90ed8740816b6344c Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Wed, 30 Sep 2020 14:04:48 +0300 Subject: Set MSVC environment script specifically for MSVC Current clause is too broad and new compilers do not work with it properly. E.g. Clang. Change-Id: I7afadfec07935e76882d27ec7ab408b0e597654b Reviewed-by: Alexandru Croitor --- coin/instructions/prepare_building_env.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin') diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index 5e781bdff4..a9e9ec3a8e 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -131,7 +131,7 @@ instructions: equals_value: Windows - condition: property property: host.compiler - not_contains_value: Mingw + contains_value: MSVC instructions: # Try to pick one of many coexistent MSVC installation to use # TODO cleanup, that could be much simpler if all tools are installed to similar paths, so it would @@ -205,7 +205,7 @@ instructions: equals_value: Windows - condition: property property: host.compiler - not_contains_value: Mingw + contains_value: MSVC - type: EnvironmentVariable variableName: ENV_PREFIX variableValue: "c:\\users\\qt\\prefix.bat" @@ -217,7 +217,7 @@ instructions: equals_value: Windows - condition: property property: host.compiler - not_contains_value: Mingw + contains_value: MSVC - type: EnvironmentVariable variableName: ENV_PREFIX variableValue: "" @@ -229,7 +229,7 @@ instructions: equals_value: Windows - condition: property property: host.compiler - not_contains_value: Mingw + contains_value: MSVC - type: Group instructions: -- cgit v1.2.3