diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-29 10:22:03 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-30 08:22:26 +0100 |
commit | de3bd644259b134d68414dcb8479f66f2f39fe70 (patch) | |
tree | df4f5eebc591b3a8f283580a469a748357bfb403 /bin/qt-configure-module.bat.in | |
parent | 3afd06cd43d78ef0992eaa6a458572eea6769297 (diff) |
CMake: Prepare configure/qt-configure-module for calling more scripts
In a subsequent change we will call another CMake script from
qt-configure-module.bat. Write the location of qtbase/cmake into the
generated scripts instead of the path to QtProcessConfigureArgs.cmake.
Change-Id: Ie333b16d310b215c6e49efa27740c7525453d28f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'bin/qt-configure-module.bat.in')
-rw-r--r-- | bin/qt-configure-module.bat.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/qt-configure-module.bat.in b/bin/qt-configure-module.bat.in index 72d3a460bf..a4858d412c 100644 --- a/bin/qt-configure-module.bat.in +++ b/bin/qt-configure-module.bat.in @@ -28,10 +28,10 @@ for %%a in (%*) do ( ) ) -set cmake_script_path=%script_dir_path%\@__relative_path_to_processconfigureargs_script@ +set cmake_scripts_dir=%script_dir_path%\@__relative_path_to_cmake_scripts_dir@ call "%script_dir_path%"\qt-cmake-private.bat -DOPTFILE=config.opt -DMODULE_ROOT="%module_root%" ^ -DCMAKE_COMMAND="%script_dir_path%\qt-cmake-private.bat" ^ - -P "%cmake_script_path%" + -P "%cmake_scripts_dir%\QtProcessConfigureArgs.cmake" goto :eof :print_usage |