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 | |
| 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')
| -rw-r--r-- | bin/qt-configure-module.bat.in | 4 | ||||
| -rwxr-xr-x | bin/qt-configure-module.in | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/bin/qt-configure-module.in b/bin/qt-configure-module.in index e102c0927b..f337f40b8c 100755 --- a/bin/qt-configure-module.in +++ b/bin/qt-configure-module.in @@ -26,5 +26,5 @@ for arg in "$@"; do echo $arg >> "$optfile" done -cmake_script_path="$script_dir_path/@__relative_path_to_processconfigureargs_script@" +cmake_script_path="$script_dir_path/@__relative_path_to_cmake_scripts_dir@/QtProcessConfigureArgs.cmake" "$script_dir_path/qt-cmake-private" -DOPTFILE=$optfile -DMODULE_ROOT="$module_root" -DCMAKE_COMMAND="$script_dir_path/qt-cmake-private" -P "$cmake_script_path" |