diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /configure.bat | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'configure.bat')
| -rw-r--r-- | configure.bat | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/configure.bat b/configure.bat index 7cadd783ea..b34e146f5f 100644 --- a/configure.bat +++ b/configure.bat @@ -125,11 +125,8 @@ goto doneargs :platform shift - if "%~1" == "win32-msvc2012" goto msvc - if "%~1" == "win32-msvc2013" goto msvc - if "%~1" == "win32-msvc2015" goto msvc - if "%~1" == "win32-msvc2017" goto msvc set PLATFORM=%~1 + if "%PLATFORM:~0,10%" == "win32-msvc" goto msvc goto nextarg :msvc echo. >&2 @@ -150,7 +147,7 @@ goto doneargs :doneargs rem Find various executables -for %%C in (clang-cl.exe cl.exe icl.exe g++.exe perl.exe jom.exe) do set %%C=%%~$PATH:C +for %%C in (clang-cl.exe clang.exe cl.exe icl.exe g++.exe perl.exe jom.exe) do set %%C=%%~$PATH:C rem Determine host spec @@ -161,6 +158,8 @@ if "%PLATFORM%" == "" ( set PLATFORM=win32-msvc ) else if not "%clang-cl.exe%" == "" ( set PLATFORM=win32-clang-msvc + ) else if not "%clang.exe%" == "" ( + set PLATFORM=win32-clang-g++ ) else if not "%g++.exe%" == "" ( set PLATFORM=win32-g++ ) else ( @@ -172,7 +171,7 @@ if not exist "%QTSRC%\mkspecs\%PLATFORM%\qmake.conf" ( echo Host platform '%PLATFORM%' is invalid. Aborting. >&2 exit /b 1 ) -if "%PLATFORM:win32-g++=%" == "%PLATFORM%" ( +if "%PLATFORM:g++=%" == "%PLATFORM%" ( if "%MAKE%" == "" ( if not "%jom.exe%" == "" ( set MAKE=jom |