diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2020-05-05 22:08:27 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-05-05 20:10:09 +0000 |
| commit | 7e23e5f33a8de960b345fbed1821a2a703a52332 (patch) | |
| tree | 5c2ab827470cf07e3ae0e29b1ded90a2380b97ed /packaging-tools/build_clang_qdoc.py | |
| parent | 55b8ce5d15c16ee92f4f931792365754724950e5 (diff) | |
Qdoc_libclang: Fix for MSVC 32 bit compiler detection
At the moment CMake is failing to detect the MSVC2019 32 bit compiler
Change-Id: I29a477d7d1f4557f98146a09954569adde38013a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'packaging-tools/build_clang_qdoc.py')
| -rw-r--r-- | packaging-tools/build_clang_qdoc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging-tools/build_clang_qdoc.py b/packaging-tools/build_clang_qdoc.py index 923114eb3..bf30cb351 100644 --- a/packaging-tools/build_clang_qdoc.py +++ b/packaging-tools/build_clang_qdoc.py @@ -101,10 +101,10 @@ def msvc_environment(bitness): msvc_ver = msvc_version() if msvc_ver == '14.1' or msvc_ver == '14.2': vcvarsall = os.path.join(program_files, 'Microsoft Visual Studio', msvc_year(), 'Professional', 'VC', 'Auxiliary', 'Build', 'vcvarsall.bat') - arg = 'x64' if bitness == 64 else 'x64_x86' + arg = 'x64' if bitness == 64 else 'x86' else: vcvarsall = os.path.join(program_files, 'Microsoft Visual Studio ' + msvc_ver, 'VC', 'vcvarsall.bat') - arg = 'amd64' if bitness == 64 else 'x64_x86' + arg = 'amd64' if bitness == 64 else 'x86' return environmentfrombatchfile.get(vcvarsall, arguments=arg) def paths_with_sh_exe_removed(path_value): |