diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake index 4f8106dfa..bec5c402e 100644 --- a/cmake/QtPostProcessHelpers.cmake +++ b/cmake/QtPostProcessHelpers.cmake @@ -472,7 +472,7 @@ function(qt_generate_install_prefixes out_var) foreach(var ${vars}) get_property(docstring CACHE "${var}" PROPERTY HELPSTRING) - string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" FORCE)\n") + string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" )\n") endforeach() set(${out_var} "${content}" PARENT_SCOPE) @@ -528,7 +528,7 @@ qt_internal_force_set_cmake_build_type_conditionally( endif() if(CMAKE_CONFIGURATION_TYPES) string(APPEND multi_config_specific - " set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\" CACHE STRING \"\" FORCE)\n") + " set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\" CACHE STRING \"\")\n") endif() if(CMAKE_TRY_COMPILE_CONFIGURATION) string(APPEND multi_config_specific @@ -655,7 +655,7 @@ endif()\n") # find_package(Qt6Core) is called in case if the feature was disabled. string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS " if(NOT QT_SKIP_BUILD_INTERNALS_PKG_CONFIG_FEATURE) - set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\" FORCE) + set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\") endif()\n") # The OpenSSL root dir needs to be saved so that repos other than qtbase (like qtopcua) can diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in index cadf3847c..6ec51fd63 100644 --- a/cmake/QtBuildInternalsExtra.cmake.in +++ b/cmake/QtBuildInternalsExtra.cmake.in @@ -41,11 +41,11 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND AND "${CMAKE_STAGING_PREFIX}" STREQUAL "" AND NOT QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX) set(CMAKE_STAGING_PREFIX "${qtbi_new_prefix}" CACHE PATH - "Staging path prefix, prepended onto install directories on the host machine." FORCE) + "Staging path prefix, prepended onto install directories on the host machine." ) set(qtbi_new_prefix "${qtbi_orig_prefix}") endif() set(CMAKE_INSTALL_PREFIX "${qtbi_new_prefix}" CACHE PATH - "Install path prefix, prepended onto install directories." FORCE) + "Install path prefix, prepended onto install directories." ) unset(qtbi_orig_prefix) unset(qtbi_real_orig_prefix) unset(qtbi_new_prefix) @@ -138,7 +138,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value) AND NOT __qt_toolchain_cmake_build_type_before_project_call AND NOT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE AND NOT __qt_internal_extras_is_multi_config) - set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build." FORCE) + set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build.") endif() endfunction()