1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing -help argument to qt-configure-module

Browse Source 
Now it's possible to display a configure help screen per module with
  qt-configure-module <module-source-dir> -help

Pick-to: 6.2
Fixes: QTBUG-95943
Change-Id: I7d26006246af4b38b5a2ec6deca3f45c5313afec
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-08-20 13:01:00 +02:00
parent 57ad532e75
commit 1ac947e3af
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/qt-configure-module.bat.in
View File

@ -28,4 +28,7 @@ goto :eof
:print_usage :print_usage
echo Usage: qt-configure-module ^<module-source-dir^> [options] 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 goto :eof

7
bin/qt-configure-module.in
View File

@ -4,7 +4,12 @@ script_dir_path=`(cd "$script_dir_path"; /bin/pwd)`
printUsage() printUsage()
{ {
echo 'Usage: qt-configure-module <module-source-dir> [options]' cat <<EOF
Usage: qt-configure-module <module-source-dir> [options]
To display the available options for a Qt module, run
qt-configure-module <module-source-dir> -help
EOF
} }
if [ "$#" -lt 1 ]; then if [ "$#" -lt 1 ]; then

22
cmake/QtProcessConfigureArgs.cmake
View File

@ -71,6 +71,8 @@ while(NOT "${configure_args}" STREQUAL "")
set(auto_detect_compiler FALSE) set(auto_detect_compiler FALSE)
elseif(arg STREQUAL "-list-features") elseif(arg STREQUAL "-list-features")
set(list_features TRUE) set(list_features TRUE)
elseif(arg MATCHES "^-h(elp)?$")
set(display_module_help TRUE)
elseif(arg STREQUAL "-write-options-for-conan") elseif(arg STREQUAL "-write-options-for-conan")
list(POP_FRONT configure_args options_json_file) list(POP_FRONT configure_args options_json_file)
elseif(arg STREQUAL "-skip") elseif(arg STREQUAL "-skip")
@ -439,6 +441,26 @@ function(qt_call_function func)
endif() endif()
endfunction() endfunction()
if(display_module_help)
message([[
Options:
-help, -h ............ Display this help screen
-feature-<feature> ... Enable <feature>
-no-feature-<feature> Disable <feature> [none]
-list-features ....... List available features. Note that some features
have dedicated command line options as well.
]])
set(help_file "${MODULE_ROOT}/config_help.txt")
if(EXISTS "${help_file}")
file(READ "${help_file}" content)
message("${content}")
endif()
return()
endif()
if(list_features) if(list_features)
unset(lines) unset(lines)
foreach(feature ${commandline_known_features}) foreach(feature ${commandline_known_features})