configure.bat: Use call when calling the helper cmake scripts
If an executable has a .bat or .cmd extension, and is executed without a prepended 'call' command within a batch script, the parent batch script execution will not continue once the child process has finished. Prepending call to the command ensures that the parent batch script continues execution. This changes ensures that configuration succeeds for the use case when cmake is actually a batch script called cmake.bat or cmake.cmd. We already use 'call' in qt-configure-module, so do it also in configure. Change-Id: Ia42cb71787e88c850f1cbd1fcef5b6decbdeaabf Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 062a7dc4248904bed51dc87466ec29b407945950) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit 004c87ced5a0a6fc09999934fee21cc637bdacba)
This commit is contained in:
parent
70b10666c3
commit
bb13bccd9f
@ -90,12 +90,12 @@ if not defined redoing (
|
||||
rem "into the file from a stream different than stdout, leading to broken or empty content."
|
||||
echo.%* >"%OPT_TMP_FILE_PATH%"
|
||||
|
||||
cmake -DIN_FILE="%OPT_TMP_FILE_PATH%" -DOUT_FILE="%OPT_FILE_PATH%" -DIGNORE_ARGS=-top-level -P "%QTSRC%\cmake\QtWriteArgsFile.cmake"
|
||||
call cmake -DIN_FILE="%OPT_TMP_FILE_PATH%" -DOUT_FILE="%OPT_FILE_PATH%" -DIGNORE_ARGS=-top-level -P "%QTSRC%\cmake\QtWriteArgsFile.cmake"
|
||||
) else (
|
||||
echo. 2> "%OPT_TMP_FILE_PATH%"
|
||||
for /F "usebackq tokens=*" %%A in ("%OPT_FILE_PATH%") do echo "%%A" >> "%OPT_TMP_FILE_PATH%"
|
||||
|
||||
cmake -DIN_FILE="%OPT_TMP_FILE_PATH%" -DREDO_FILE="%REDO_TMP_FILE_PATH%" -DOUT_FILE="%REDO_FILE_PATH%" -DIGNORE_ARGS="-top-level;-redo;--redo" -P "%QTSRC%\cmake\QtWriteArgsFile.cmake"
|
||||
call cmake -DIN_FILE="%OPT_TMP_FILE_PATH%" -DREDO_FILE="%REDO_TMP_FILE_PATH%" -DOUT_FILE="%REDO_FILE_PATH%" -DIGNORE_ARGS="-top-level;-redo;--redo" -P "%QTSRC%\cmake\QtWriteArgsFile.cmake"
|
||||
|
||||
set OPT_FILE_PATH=%REDO_FILE_PATH%
|
||||
set FRESH_REQUESTED_ARG=-DFRESH_REQUESTED=TRUE
|
||||
@ -104,4 +104,4 @@ if not defined redoing (
|
||||
rem Launch CMake-based configure
|
||||
set TOP_LEVEL_ARG=
|
||||
if %TOPLEVEL% == true set TOP_LEVEL_ARG=-DTOP_LEVEL=TRUE
|
||||
cmake -DOPTFILE="%OPT_FILE_PATH%" %TOP_LEVEL_ARG% %FRESH_REQUESTED_ARG% -P "%QTSRC%\cmake\QtProcessConfigureArgs.cmake"
|
||||
call cmake -DOPTFILE="%OPT_FILE_PATH%" %TOP_LEVEL_ARG% %FRESH_REQUESTED_ARG% -P "%QTSRC%\cmake\QtProcessConfigureArgs.cmake"
|
||||
|
Loading…
x
Reference in New Issue
Block a user