configure: Simplify handling of the -make and -nomake options

Remove the options '-make libs'. This was doing nothing.
We don't have a QT_BUILD_LIBS variable.

Remove the option '-make tools'. This was doing nothing. We could map
this to QT_FORCE_BUILD_TOOLS=ON, but this would be confusing for desktop
builds, because QT_FORCE_BUILD_TOOLS=ON yields an error if QT_HOST_TOOLS
is not set.

Remove the option '-nomake tools'. This was printing a "not yet
implemented warning" without any further effect. This could be mapped to
QT_FORCE_BUILD_TOOLS=OFF but people expect different behavior from this
option (e.g. disabling all apps).

The list of allowed values for -make and -nomake is now in one location:
qt_cmdline.cmake, and the superfluous handling of unknown input has been
removed from QtProcessConfigureArgs.cmake. Every value of -make /
-nomake now maps simply to QT_BUILD_<part>=ON/OFF.

Change-Id: I251dd6185d6ae1f22c90b2b8443ba008a6da01f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

Author: jobor

cmake/QtProcessConfigureArgs.cmake

@@ -1002,20 +1002,10 @@ function(check_qt_build_parts type)
         set(buildFlag "FALSE")
     endif()
 
-    list(APPEND knownParts "tests" "examples" "benchmarks" "manual-tests"
-        "minimal-static-tests" "doc-snippets")
-
     foreach(part ${${input}})
-        if(part IN_LIST knownParts)
-            qt_feature_normalize_name("${part}" partUpperCase)
-            string(TOUPPER "${partUpperCase}" partUpperCase)
-            push("-DQT_BUILD_${partUpperCase}=${buildFlag}")
-            continue()
-        elseif("${part}" STREQUAL "tools" AND "${type}" STREQUAL "make")
-            # default true ignored
-            continue()
-        endif()
-        qtConfAddWarning("'-${type} ${part}' is not implemented yet.")
+        qt_feature_normalize_name("${part}" partUpperCase)
+        string(TOUPPER "${partUpperCase}" partUpperCase)
+        push("-DQT_BUILD_${partUpperCase}=${buildFlag}")
     endforeach()
     set(cmake_args "${cmake_args}" PARENT_SCOPE)
 endfunction()

config_help.txt

@@ -242,11 +242,10 @@ Component selection:
                          to configure.
   -make <part> ......... Add <part> to the list of parts to be built.
                          Specifying this option clears the default list first.
-                         (allowed values: libs, tools, examples, tests,
+                         (allowed values: examples, tests,
                          benchmarks, manual-tests, minimal-static-tests,
-                         doc-snippets) [default: libs and examples, also tools
-                         if not cross-building, also tests and doc-snippets if
-                         -developer-build]
+                         doc-snippets)
+                         [default: tests and doc-snippets if -developer-build]
   -nomake <part> ....... Exclude <part> from the list of parts to be built.
   -install-examples-sources Installs examples source code into the Qt prefix
                          Only possible when -make examples is also passed

qt_cmdline.cmake

@@ -92,16 +92,15 @@ qt_commandline_option(stack-clash-protection TYPE boolean NAME stack_clash_prote
 qt_commandline_option(libstdcpp-assertions TYPE boolean NAME libstdcpp_assertions)
 qt_commandline_option(libcpp-hardening TYPE boolean NAME libcpp_hardening)
 qt_commandline_option(relro-now-linker TYPE boolean NAME relro_now_linker)
-qt_commandline_option(make TYPE addString VALUES examples libs tests tools
-                      benchmarks manual-tests minimal-static-tests doc-snippets)
+set(allowed_build_parts examples tests benchmarks manual-tests minimal-static-tests doc-snippets)
+qt_commandline_option(make TYPE addString VALUES ${allowed_build_parts})
+qt_commandline_option(nomake TYPE addString VALUES ${allowed_build_parts})
 qt_commandline_option(install-examples-sources
     TYPE boolean
     CMAKE_VARIABLE QT_INSTALL_EXAMPLES_SOURCES
 )
 qt_commandline_option(mips_dsp TYPE boolean)
 qt_commandline_option(mips_dspr2 TYPE boolean)
-qt_commandline_option(nomake TYPE addString VALUES examples tests tools benchmarks
-                      manual-tests minimal-static-tests doc-snippets)
 qt_commandline_option(opensource TYPE void NAME commercial VALUE no)
 qt_commandline_option(optimize-debug TYPE boolean NAME optimize_debug)
 qt_commandline_option(optimize-size TYPE boolean NAME optimize_size)