diff options
Diffstat (limited to 'bin/qt-configure-module.bat.in')
| -rw-r--r-- | bin/qt-configure-module.bat.in | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/bin/qt-configure-module.bat.in b/bin/qt-configure-module.bat.in index 48fbcceae5..26d5c4b051 100644 --- a/bin/qt-configure-module.bat.in +++ b/bin/qt-configure-module.bat.in @@ -9,6 +9,7 @@ if "%1" == "" ( ) set module_root=%1 +set module_root=%module_root:\=/% shift if not exist "%module_root%\CMakeLists.txt" ( echo Error: %module_root% is not a valid Qt module source directory. >&2 @@ -16,24 +17,18 @@ if not exist "%module_root%\CMakeLists.txt" ( exit /b 1 ) -if exist "config.opt" del "config.opt" -echo. > "config.opt" -set first_iteration=indeed -for %%a in (%*) do ( - if defined first_iteration ( - :: Drop the first argument, which is the module root. - set first_iteration= - ) else ( - echo %%a >> "config.opt" - ) -) - -set cmake_script_path=%script_dir_path%\@__relative_path_to_processconfigureargs_script@ -call "%script_dir_path%"\qt-cmake-private.bat -DOPTFILE=config.opt -DMODULE_ROOT="%module_root%" ^ +set cmake_scripts_dir=%script_dir_path%\@__relative_path_to_cmake_scripts_dir@ +echo %*>config.opt.in +call "%script_dir_path%\qt-cmake.bat" -DSKIP_ARGS=1 -DIN_FILE=config.opt.in -DOUT_FILE=config.opt ^ + -P "%cmake_scripts_dir%\QtWriteArgsFile.cmake" +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 echo Usage: qt-configure-module ^<module-source-dir^> [options] +echo. +echo To display the available options for a Qt module, run +echo qt-configure-module ^<module-source-dir^> -help goto :eof |