lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

leave makefile generation to the real configure

Browse Source 
call it with the "secret" -top-level option, which shifts the makefile
generation one level up.

this makes the configure call the last thing we do, thus also avoiding
the problems we had with the -help switch (and the previous attempts at
fixing it).

Change-Id: I80ba4a09b260a140a9d1b976277c30fd1436b4d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen
2013-06-18 15:14:30 +02:00
committed by The Qt Project
parent 9b68559f3c
commit ef8000991e
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@@ -53,11 +53,5 @@ mkdir -p qtbase || exit
echo "+ cd qtbase" echo "+ cd qtbase"
cd qtbase || exit cd qtbase || exit
echo "+ $configure $@" echo "+ $configure -top-level $@"
"$configure" "$@" || exit 1 exec "$configure" -top-level "$@"
echo "+ cd .."
cd ..
echo "+ qtbase/bin/qmake $srcpath"
exec qtbase/bin/qmake "$srcpath"

11
configure.bat
View File

@@ -52,17 +52,10 @@ if not exist qtbase mkdir qtbase || exit /b 1
echo + cd qtbase echo + cd qtbase
cd qtbase || exit /b 1 cd qtbase || exit /b 1
echo + %configure% %* echo + %configure% -top-level %*
call %configure% %* call %configure% -top-level %*
set err=%errorlevel% set err=%errorlevel%
cd .. cd ..
if not %err% == 0 goto out
echo + qtbase\bin\qmake %srcpath%
qtbase\bin\qmake %srcpath%
set err=%errorlevel%
:out
exit /b %err% exit /b %err%