AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fix top-level configure

Browse Source 
The working directory for CMake must be the top-level build dir, not the
qtbase one.

Change-Id: I1090aca8bf2617719e724f96b1fa356eb9fabb46
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-07-16 13:27:30 +02:00
parent b2504af4da
commit 044cb3ce20
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -921,13 +921,19 @@ if [ "$BUILD_WITH_CMAKE" = "yes" ]; then
checkTopLevelBuild "$@" checkTopLevelBuild "$@"
getOptAndQMakeCmdLines "$@" getOptAndQMakeCmdLines "$@"
if [ -z "$optfile" ]; then # only write optfile if not currently redoing if [ -z "$optfile" ]; then # only write optfile if not currently redoing
optfile=${outpathPrefix}config.opt optfilename=config.opt
if [ -f "$optfile" ]; then rm "$optfile"; fi optfilepath=${outpathPrefix}${optfilename}
if [ -f "$optfilepath" ]; then rm "$optfilepath"; fi
for arg in "$@"; do for arg in "$@"; do
echo $arg >> "$optfile" echo $arg >> "$optfilepath"
done done
fi fi
cmake "-DOPTFILE=$optfile" -P "$relpath/cmake/QtProcessConfigureArgs.cmake"
if [ -n "$CFG_TOPLEVEL" ]; then
cd ..
fi
cmake "-DOPTFILE=$optfilename" -P "$relpath/cmake/QtProcessConfigureArgs.cmake"
else else
findPerl findPerl
findAwk findAwk

3
configure.bat
View File

@ -315,4 +315,5 @@ if "%rargs%" == "" (
) )
rem Launch CMake-based configure rem Launch CMake-based configure
cmake -DOPTFILE="%TOPQTDIR%\config.opt" -P "%QTSRC%\cmake\QtProcessConfigureArgs.cmake" cd "%TOPQTDIR%"
cmake -DOPTFILE=config.opt -P "%QTSRC%\cmake\QtProcessConfigureArgs.cmake"