diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-06-12 16:09:31 +0200 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-06-13 11:38:13 +0000 |
| commit | 341cc6e5bba4d06d2a17e85be7f5b9e52c0ac4b8 (patch) | |
| tree | ec4fe18b4eb56f312021875bada3f2d7498fc38d /coin | |
| parent | d59fadb2daaecd91285fc3aa6b9a33cb13cce7ab (diff) | |
Try to use %ProgramFiles(x86)% instead of custom code
On Windows, we have a problem with locating MSVC. Depending on system
version it can be installed in different directories. Currently
we have a custom logic to handle it, but in theory we could just use
"ProgramFiles(x86)" to abstract it.
Change-Id: Ia94a41d9ef6229de712606f9a9d3d61a0abeb24f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/module_config.yaml | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index e596240b58..4de47d1e40 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -59,28 +59,13 @@ windows_specific_instrucitons: - &find_path_to_compiler # MSVC is installed in somehow arbitrary places. To reduce amount of combinations we need to make a variable. # This seems inverted, but on 64 bit hosts VS is installed into the x86 path, otherwise the regular one - # TODO cleanup, that step could be removed if we have same installation paths or we read the path from registry - # or we use %ProgramFiles(x86)%. + # TODO cleanup, that step could be removed if we have same installation paths or we read the path from registry. type: Group enable_if: condition: property property: host.os equals_value: Windows instructions: - - type: EnvironmentVariable - variableName: PROGRAM_FILES_PATH - variableValue: "C:\\Program Files" - disable_if: - condition: property - property: host.arch - not_equals_value: X86 - - type: EnvironmentVariable - variableName: PROGRAM_FILES_PATH - variableValue: "C:\\Program Files (x86)" - disable_if: - condition: property - property: host.arch - equals_value: X86 # 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 # be enough to substitute compiler name. @@ -100,35 +85,35 @@ windows_specific_instrucitons: equals_value: MSVC2010 - type: EnvironmentVariable variableName: VC_SCRIPT - variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio 11.0\\VC\\vcvarsall.bat" + variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio 11.0\\VC\\vcvarsall.bat" enable_if: condition: property property: host.compiler equals_value: MSVC2012 - type: EnvironmentVariable variableName: VC_SCRIPT - variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat" + variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat" enable_if: condition: property property: host.compiler equals_value: MSVC2013 - type: EnvironmentVariable variableName: VC_SCRIPT - variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" + variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" enable_if: condition: property property: host.compiler equals_value: MSVC2015 - type: EnvironmentVariable variableName: VC_SCRIPT - variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat" + variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat" enable_if: condition: property property: host.compiler equals_value: MSVC2017 - type: EnvironmentVariable variableName: VC_SCRIPT - variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio\\2019\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat" + variableValue: "%ProgramFiles(x86)%\\Microsoft Visual Studio\\2019\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat" enable_if: condition: property property: host.compiler |