diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-05 18:15:52 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-06 08:53:52 +0200 |
| commit | d9a9eca54d72583ec03caedc10f83e080a20b031 (patch) | |
| tree | ae8b34b70cd7a9730d54e86c7738e1acde432836 /cmake/QtProcessConfigureArgs.cmake | |
| parent | 16e869bd01eb013b90c345b37e89c1ff9488e32d (diff) | |
Remove unsupported host-related configure options
The following host-related configure options were unsupported since Qt
6.0 and are now completely removed:
-hostprefix
-external-hostbindir
-host*dir (except -hostdatadir)
-android-ndk-host
Pick-to: 6.2
Change-Id: Ib69d90c40ef546f61bf87b1f443eb9d10f7a5a21
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtProcessConfigureArgs.cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 2a415454a8..c13c2dde35 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -76,12 +76,6 @@ while(NOT "${configure_args}" STREQUAL "") elseif(arg STREQUAL "-skip") list(POP_FRONT configure_args qtrepo) push("-DBUILD_${qtrepo}=OFF") - elseif(arg STREQUAL "-hostprefix") - message(FATAL_ERROR "${arg} is not supported in the CMake build.") - elseif(arg STREQUAL "-external-hostbindir") - # This points to the bin directory of the Qt installation. - # This can be multiple levels deep and we cannot deduce the QT_HOST_PATH safely. - message(FATAL_ERROR "${arg} is not supported anymore. Use -qt-host-path <dir> instead.") elseif(arg STREQUAL "-qt-host-path") pop_path_argument() push("-DQT_HOST_PATH=${path}") @@ -99,8 +93,6 @@ while(NOT "${configure_args}" STREQUAL "") set(cmake_file_api TRUE) elseif(arg STREQUAL "-no-cmake-file-api") set(cmake_file_api FALSE) - elseif(arg MATCHES "^-host.*dir") - message(FATAL_ERROR "${arg} is not supported anymore.") elseif(arg STREQUAL "--") # Everything after this argument will be passed to CMake verbatim. list(APPEND cmake_args "${configure_args}") @@ -800,12 +792,6 @@ translate_string_input(qpa_default_platform QT_QPA_DEFAULT_PLATFORM) translate_path_input(android-sdk ANDROID_SDK_ROOT) translate_path_input(android-ndk ANDROID_NDK_ROOT) -if(DEFINED INPUT_android-ndk-host) - drop_input(android-ndk-host) - qtConfAddWarning("The -android-ndk-host option is not supported with the CMake build. " - "Determining the right host platform is handled by the CMake toolchain file that is " - "located in your NDK.") -endif() if(DEFINED INPUT_android-ndk-platform) drop_input(android-ndk-platform) string(REGEX REPLACE "^android-" "" INPUT_android-ndk-platform "${INPUT_android-ndk-platform}") |