mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-21 23:17:50 +08:00
47 lines
2.4 KiB
Diff
47 lines
2.4 KiB
Diff
|
diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake
|
||
|
|
index 4f8106dfa..bec5c402e 100644
|
||
|
|
--- a/cmake/QtPostProcessHelpers.cmake
|
||
|
|
+++ b/cmake/QtPostProcessHelpers.cmake
|
||
|
|
@@ -414,7 +414,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)
|
||
|
|
@@ -465,12 +465,12 @@ function(qt_generate_build_internals_extra_cmake_code)
|
||
|
|
# at the start of project configuration (with an empty value),
|
||
|
|
# so we need to force override it.
|
||
|
|
string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
|
||
|
|
- "set(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\" CACHE STRING \"Choose the type of build.\" FORCE)\n")
|
||
|
|
+ "set(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\" CACHE STRING \"Choose the type of build.\")\n")
|
||
|
|
|
||
|
|
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
|
||
|
|
@@ -492,7 +492,7 @@ function(qt_generate_build_internals_extra_cmake_code)
|
||
|
|
if(multi_config_specific)
|
||
|
|
string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS "
|
||
|
|
if(QT_BUILD_STANDALONE_TESTS)
|
||
|
|
- set(CMAKE_BUILD_TYPE \"\${QT_MULTI_CONFIG_FIRST_CONFIG}\" CACHE STRING \"Choose the type of build.\" FORCE)
|
||
|
|
+ set(CMAKE_BUILD_TYPE \"\${QT_MULTI_CONFIG_FIRST_CONFIG}\" CACHE STRING \"Choose the type of build.\")
|
||
|
|
endif()\n")
|
||
|
|
endif()
|
||
|
|
|
||
|
|
@@ -583,7 +583,7 @@ endif()\n")
|
||
|
|
if(\"$\{CMAKE_STAGING_PREFIX}\" STREQUAL \"\"
|
||
|
|
AND NOT QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX)
|
||
|
|
set(CMAKE_STAGING_PREFIX \"${CMAKE_STAGING_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.\" )
|
||
|
|
endif()
|
||
|
|
")
|
||
|
|
endif()
|