CMake: Document more configure argument mappings

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

1 files changed, 66 insertions, 57 deletions

diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md
index 2f6814e283..3116aa0be0 100644
--- a/cmake/configure-cmake-mapping.md
+++ b/cmake/configure-cmake-mapping.md
@@ -33,7 +33,7 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349.
 | -force-debug-info                     | Use the RelWithDebInfo build config.              |                                                                 |
 | -separate-debug-info                  | -DFEATURE_separate_debug_info=ON                  |                                                                 |
 | -gdb-index                            | -DFEATURE_enable_gdb_index=ON                     |                                                                 |
-| -strip                                |                                                   |                                                                 |
+| -strip                                | cmake --install . --strip                         | This affects the install targets generated by qmake.            |
 | -gc-binaries                          | -DFEATURE_gc_binaries=ON                          |                                                                 |
 | -force-asserts                        | -DFEATURE_force_asserts=ON                        |                                                                 |
 | -developer-build                      | -DFEATURE_developer_build=ON                      |                                                                 |
@@ -45,7 +45,7 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349.
 | -device <name>                        | equivalent to -xplatform devices/<name>           |                                                                 |
 | -device-option <key=value>            | -DQT_QMAKE_DEVICE_OPTIONS=key1=value1;key2=value2 | Only used for generation qmake-compatibility files.             |
 |                                       |                                                   | The device options are written into mkspecs/qdevice.pri.        |
-| -appstore-compliant                   |                                                   |                                                                 |
+| -appstore-compliant                   | -DFEATURE_appstore_compliant=ON                   |                                                                 |
 | -qtnamespace <name>                   | -DQT_NAMESPACE=<name>                             |                                                                 |
 | -qtlibinfix <infix>                   |                                                   |                                                                 |
 | -testcocoon                           |                                                   |                                                                 |
@@ -55,8 +55,8 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349.
 | -sanitize <arg>                       | -DFEATURE_sanitize_<arg>                          |                                                                 |
 | -coverage <arg>                       |                                                   |                                                                 |
 | -c++std c++2a                         | -DFEATURE_cxx2a=ON                                |                                                                 |
-| -sse2/sse3/-ssse3/-sse4.1             |                                                   |                                                                 |
-| -mips_dsp/-mips_dspr2                 |                                                   |                                                                 |
+| -sse2/-sse3/-ssse3/-sse4.1            | -DFEATURE_sse4=ON                                 |                                                                 |
+| -mips_dsp/-mips_dspr2                 | -DFEATURE_mips_dsp=ON                             |                                                                 |
 | -qreal <type>                         | -DQT_COORD_TYPE=<type>                            |                                                                 |
 | -R <string>                           | -DQT_EXTRA_RPATHS=path1;path2                     |                                                                 |
 | -rpath                                | negative CMAKE_SKIP_BUILD_RPATH                   |                                                                 |
@@ -69,7 +69,9 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349.
 | -ltcg                                 |                                                   |                                                                 |
 | -linker [bfd,gold,lld]                | -DINPUT_linker=<name> or                          |                                                                 |
 |                                       | -DFEATURE_use_<name>_linker=ON                    |                                                                 |
-| -incredibuild-xge                     |                                                   |                                                                 |
+| -incredibuild-xge                     | n/a                                               | This option enables remote distribution of Visual Studio        |
+|                                       |                                                   | custom build steps for moc, uic, and rcc.                       |
+|                                       |                                                   | This lacks support in CMake.                                    |
 | -ccache                               | -DQT_USE_CCACHE=ON                                |                                                                 |
 | -make-tool <tool>                     | n/a                                               |                                                                 |
 | -mp                                   | n/a                                               |                                                                 |
@@ -78,8 +80,10 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349.
 | -silent                               | n/a                                               |                                                                 |
 | -sysroot <dir>                        | -DCMAKE_SYSROOT=<dir>                             | Should be provided by a toolchain file that's                   |
 |                                       |                                                   | passed via -DCMAKE_TOOLCHAIN_FILE=<filename>                    |
-| -no-gcc-sysroot                       |                                                   |                                                                 |
-| -no-pkg-config                        |                                                   |                                                                 |
+| -no-gcc-sysroot                       | n/a                                               | The corresponding CMake variables are CMAKE_SYSROOT_LINK        |
+|                                       |                                                   | and CMAKE_SYSROOT_COMPILE.                                      |
+|                                       |                                                   | They are usually set in a toolchain file.                       |
+| -no-pkg-config                        | -DFEATURE_pkg_config=OFF                          |                                                                 |
 | -D <string>                           | -DQT_EXTRA_DEFINES=<string1>;<string2>            |                                                                 |
 | -I <string>                           | -DQT_EXTRA_INCLUDEPATHS=<string1>;<string2>       |                                                                 |
 | -L <string>                           | -DQT_EXTRA_LIBDIRS=<string1>;<string2>            |                                                                 |
@@ -97,59 +101,64 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349.
 | -nomake <part>                        | -DBUILD_TESTING=OFF                               | A way to turn off tools explicitly is missing.                  |
 |                                       | -DBUILD_EXAMPLES=OFF                              |                                                                 |
 | -compile-examples                     |                                                   |                                                                 |
-| -gui                                  |                                                   |                                                                 |
-| -widgets                              |                                                   |                                                                 |
-| -no-dbus                              |                                                   |                                                                 |
-| -dbus-linked                          |                                                   |                                                                 |
-| -dbus-runtime                         |                                                   |                                                                 |
-| -accessibility                        |                                                   |                                                                 |
-| -doubleconversion                     |                                                   |                                                                 |
-| -glib                                 |                                                   |                                                                 |
-| -eventfd                              |                                                   |                                                                 |
-| -inotify                              |                                                   |                                                                 |
-| -icu                                  |                                                   |                                                                 |
-| -pcre                                 |                                                   |                                                                 |
-| -pps                                  |                                                   |                                                                 |
-| -zlib                                 |                                                   |                                                                 |
-| -ssl                                  |                                                   |                                                                 |
-| -no-openssl                           |                                                   |                                                                 |
-| -openssl-linked                       |                                                   |                                                                 |
-| -openssl-runtime                      |                                                   |                                                                 |
-| -schannel                             |                                                   |                                                                 |
-| -securetransport                      |                                                   |                                                                 |
-| -sctp                                 |                                                   |                                                                 |
-| -libproxy                             |                                                   |                                                                 |
-| -system-proxies                       |                                                   |                                                                 |
-| -cups                                 |                                                   |                                                                 |
-| -fontconfig                           |                                                   |                                                                 |
-| -freetype                             |                                                   |                                                                 |
-| -harfbuzz                             |                                                   |                                                                 |
-| -gtk                                  |                                                   |                                                                 |
-| -lgmon                                |                                                   |                                                                 |
+| -no-gui                               |                                                   |                                                                 |
+| -no-widgets                           | -DFEATURE_widgets=OFF                             |                                                                 |
+| -no-dbus                              | -DFEATURE_dbus=OFF                                |                                                                 |
+| -dbus [linked/runtime]                | -DINPUT_dbus=[linked/runtime]                     |                                                                 |
+| -dbus-linked                          | -DINPUT_dbus=linked                               |                                                                 |
+| -dbus-runtime                         | -DINPUT_dbus=runtime                              |                                                                 |
+| -accessibility                        | -DFEATURE_accessibility=ON                        |                                                                 |
+| -doubleconversion                     | -DFEATURE_doubleconversion=ON                     |                                                                 |
+|                                       | -DFEATURE_system_doubleconversion=ON/OFF          |                                                                 |
+| -glib                                 | -DFEATURE_glib=ON                                 |                                                                 |
+| -eventfd                              | -DFEATURE_eventfd=ON                              |                                                                 |
+| -inotify                              | -DFEATURE_inotify=ON                              |                                                                 |
+| -icu                                  | -DFEATURE_icu=ON                                  |                                                                 |
+| -pcre                                 | -DFEATURE_pcre2=ON                                |                                                                 |
+| -pcre [system/qt]                     | -DFEATURE_system_pcre2=ON/OFF                     |                                                                 |
+| -pps                                  | n/a                                               | QNX feature. Not available for 6.0.                             |
+| -zlib [system/qt]                     | -DFEATURE_system_zlib=ON/OFF                      |                                                                 |
+| -ssl                                  | -DFEATURE_ssl=ON                                  |                                                                 |
+| -openssl [no/yes/linked/runtime]      | -DINPUT_openssl=no/yes/linked/runtime             |                                                                 |
+| -openssl-linked                       | -DINPUT_openssl=linked                            |                                                                 |
+| -openssl-runtime                      | -DINPUT_openssl=runtime                           |                                                                 |
+| -schannel                             | -DFEATURE_schannel=ON                             |                                                                 |
+| -securetransport                      | -DFEATURE_securetransport=ON                      |                                                                 |
+| -sctp                                 | -DFEATURE_sctp=ON                                 |                                                                 |
+| -libproxy                             | -DFEATURE_libproxy=ON                             |                                                                 |
+| -system-proxies                       | -DFEATURE_system_proxies=ON                       |                                                                 |
+| -cups                                 | -DFEATURE_cups=ON                                 |                                                                 |
+| -fontconfig                           | -DFEATURE_fontconfig=ON                           |                                                                 |
+| -freetype [no/qt/system]              | -DFEATURE_freetype=ON/OFF                         |                                                                 |
+|                                       | -DFEATURE_system_freetype=ON/OFF                  |                                                                 |
+| -harfbuzz [no/qt/system]              | -DFEATURE_harfbuzz=ON                             |                                                                 |
+|                                       | -DFEATURE_system_harfbuzz=ON/OFF                  |                                                                 |
+| -gtk                                  | -DFEATURE_gtk3=ON                                 |                                                                 |
+| -lgmon                                | n/a                                               | QNX-specific                                                    |
 | -no-opengl                            |                                                   |                                                                 |
 | -opengl <api>                         |                                                   |                                                                 |
 | -opengles3                            |                                                   |                                                                 |
 | -egl                                  |                                                   |                                                                 |
 | -qpa <name>                           |                                                   |                                                                 |
-| -xcb-xlib                             |                                                   |                                                                 |
-| -direct2d                             |                                                   |                                                                 |
-| -directfb                             |                                                   |                                                                 |
-| -eglfs                                |                                                   |                                                                 |
-| -gbm                                  |                                                   |                                                                 |
-| -kms                                  |                                                   |                                                                 |
-| -linuxfb                              |                                                   |                                                                 |
-| -xcb                                  |                                                   |                                                                 |
-| -libudev                              |                                                   |                                                                 |
-| -evdev                                |                                                   |                                                                 |
-| -imf                                  |                                                   |                                                                 |
-| -libinput                             |                                                   |                                                                 |
-| -mtdev                                |                                                   |                                                                 |
+| -xcb-xlib                             | -DFEATURE_xcb_xlib=ON                             |                                                                 |
+| -direct2d                             | -DFEATURE_direct2d=ON                             |                                                                 |
+| -directfb                             | -DFEATURE_directfb=ON                             |                                                                 |
+| -eglfs                                | -DFEATURE_eglfs=ON                                |                                                                 |
+| -gbm                                  | -DFEATURE_gbm=ON                                  |                                                                 |
+| -kms                                  | -DFEATURE_kms=ON                                  |                                                                 |
+| -linuxfb                              | -DFEATURE_linuxfb=ON                              |                                                                 |
+| -xcb                                  | -DFEATURE_xcb=ON                                  |                                                                 |
+| -libudev                              | -DFEATURE_libudev=ON                              |                                                                 |
+| -evdev                                | -DFEATURE_evdev=ON                                |                                                                 |
+| -imf                                  | n/a                                               | QNX-specific                                                    |
+| -libinput                             | -DFEATURE_libinput=ON                             |                                                                 |
+| -mtdev                                | -DFEATURE_mtdev=ON                                |                                                                 |
 | -tslib                                | -DFEATURE_tslib=ON                                |                                                                 |
-| -bundled-xcb-xinput                   |                                                   |                                                                 |
-| -xkbcommon                            |                                                   |                                                                 |
-| -gif                                  |                                                   |                                                                 |
-| -ico                                  |                                                   |                                                                 |
-| -libpng                               |                                                   |                                                                 |
-| -libjpeg                              |                                                   |                                                                 |
-| -sql-<driver>                         |                                                   |                                                                 |
-| -sqlite                               |                                                   |                                                                 |
+| -bundled-xcb-xinput                   | -DFEATURE_system_xcb_xinput=OFF                   |                                                                 |
+| -xkbcommon                            | -DFEATURE_xkbcommon=ON                            |                                                                 |
+| -gif                                  | -DFEATURE_gif=ON                                  |                                                                 |
+| -ico                                  | -DFEATURE_ico=ON                                  |                                                                 |
+| -libpng                               | -DFEATURE_libpng=ON                               |                                                                 |
+| -libjpeg                              | -DFEATURE_libjpeg=ON                              |                                                                 |
+| -sql-<driver>                         | -DFEATURE_sql_<driver>=ON                         |                                                                 |
+| -sqlite [qt/system]                   | -DFEATURE_system_sqlite=OFF/ON                    |                                                                 |