1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure.bat: Search for icl.exe before cl.exe

Browse Source 
The Intel compiler's compilervars.bat also puts the MSVC compiler in
PATH, so cl.exe was always being found first.

Change-Id: I72e524da10fb0e221c4530a3e5c1a4a347c3f878
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Thiago Macieira 2015-07-15 15:44:49 -07:00
parent 78d8759b04
commit 0d9db5821c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.bat
View File

@ -60,16 +60,16 @@ if errorlevel 1 goto exit
echo #### Generated by configure.bat - DO NOT EDIT! ####> Makefile echo #### Generated by configure.bat - DO NOT EDIT! ####> Makefile
echo/>> Makefile echo/>> Makefile
for /f "tokens=3 usebackq" %%V in (`findstr QT_VERSION_STR %QTSRC%src\corelib\global\qglobal.h`) do @echo QTVERSION = %%~V>> Makefile for /f "tokens=3 usebackq" %%V in (`findstr QT_VERSION_STR %QTSRC%src\corelib\global\qglobal.h`) do @echo QTVERSION = %%~V>> Makefile
if not "%cl.exe%" == "" ( if not "%icl.exe%" == "" (
echo CXX = cl>>Makefile echo CXX = icl>>Makefile
echo EXTRA_CXXFLAGS =>>Makefile echo EXTRA_CXXFLAGS = /Zc:forScope>>Makefile
rem This must have a trailing space. rem This must have a trailing space.
echo QTSRC = %QTSRC% >> Makefile echo QTSRC = %QTSRC% >> Makefile
set tmpl=win32 set tmpl=win32
set make=nmake set make=nmake
) else if not "%icl.exe%" == "" ( ) else if not "%cl.exe%" == "" (
echo CXX = icl>>Makefile echo CXX = cl>>Makefile
echo EXTRA_CXXFLAGS = /Zc:forScope>>Makefile echo EXTRA_CXXFLAGS =>>Makefile
rem This must have a trailing space. rem This must have a trailing space.
echo QTSRC = %QTSRC% >> Makefile echo QTSRC = %QTSRC% >> Makefile
set tmpl=win32 set tmpl=win32