diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-02-23 12:25:03 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-02-24 03:42:28 +0100 |
| commit | bb209b5715538b3994506b4428777114791a8e26 (patch) | |
| tree | 7da6ce8012ed92d7285e6274dd1a198c8a104808 /cmake | |
| parent | 7341251e0ece7e202e3b5fb02fec6b17d61304c9 (diff) | |
Fix the mapping between configure arguments and CMake variables
Pick-to: 6.2 6.3
Fixes: QTBUG-101172
Change-Id: Ie1e01880911e771eedbf29b0d2d0607bc25b0549
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/configure-cmake-mapping.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index 2470ff9096..01f7d5f164 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -89,8 +89,8 @@ The following table describes the mapping of configure options to CMake argument | | | If no value is provided, a simulator_and_device build is | | | | assumed. | | -android-sdk <path> | -DANDROID_SDK_ROOT=<path> | | -| -android-ndk <path> | -DCMAKE_TOOLCHAIN_PATH=<toolchain file in NDK> | | -| -android-ndk-platform android-23 | -DCMAKE_ANDROID_NATIVE_API_LEVEL=23 | | +| -android-ndk <path> | -DCMAKE_TOOLCHAIN_FILE=<toolchain file in NDK> | | +| -android-ndk-platform android-23 | -DANDROID_NATIVE_API_LEVEL=23 | | | -android-abis <abi_1>,...,<abi_n> | -DANDROID_ABI=<abi_1> | only one ABI can be specified | | -android-style-assets | -DFEATURE_android_style_assets=ON | | | -android-javac-source | -DQT_ANDROID_JAVAC_SOURCE=7 | Set the javac build source version. | @@ -103,7 +103,7 @@ The following table describes the mapping of configure options to CMake argument | | | -DQT_BUILD_EXAMPLES_BY_DEFAULT=OFF. Note that if you entirely | | | | disable tests/examples at configure time (by using | | | | -DQT_BUILD_TESTS=OFF or -DQT_BUILD_EXAMPLES=OFF) you can't then | -| | | build them separately, after configuration. | +| | | build them separately, after configuration. | | -nomake <part> | -DQT_BUILD_TESTS=OFF | A way to turn off tools explicitly is missing. | | | -DQT_BUILD_EXAMPLES=OFF | | | -no-gui | -DFEATURE_gui=OFF | | |