mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 09:49:02 +08:00
42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
|
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
|
||
|
|
index d08126731..efd1ada92 100644
|
||
|
|
--- a/cmake/QtBuild.cmake
|
||
|
|
+++ b/cmake/QtBuild.cmake
|
||
|
|
@@ -387,7 +387,7 @@ set(QT_KNOWN_MODULES_WITH_TOOLS "" CACHE INTERNAL "Known Qt modules with tools"
|
||
|
|
|
||
|
|
# Reset syncqt cache variable, to make sure it gets recomputed on reconfiguration, otherwise
|
||
|
|
# it might not get installed.
|
||
|
|
-unset(QT_SYNCQT CACHE)
|
||
|
|
+# unset(QT_SYNCQT CACHE)
|
||
|
|
|
||
|
|
# For adjusting variables when running tests, we need to know what
|
||
|
|
# the correct variable is for separating entries in PATH-alike
|
||
|
|
diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in
|
||
|
|
index 9eb913f4d..286f3287e 100644
|
||
|
|
--- a/cmake/QtBuildInternalsExtra.cmake.in
|
||
|
|
+++ b/cmake/QtBuildInternalsExtra.cmake.in
|
||
|
|
@@ -35,8 +35,8 @@ endif()
|
||
|
|
set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL
|
||
|
|
"Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE)
|
||
|
|
|
||
|
|
-set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH
|
||
|
|
-"A path to the source tree of the previously configured QtBase project." FORCE)
|
||
|
|
+# set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH
|
||
|
|
+# "A path to the source tree of the previously configured QtBase project." FORCE)
|
||
|
|
|
||
|
|
# Propagate decision of building tests and examples to other repositories.
|
||
|
|
set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.")
|
||
|
|
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
|
||
|
|
index 30d3bd6d3..80bb2bf46 100644
|
||
|
|
--- a/cmake/QtPrlHelpers.cmake
|
||
|
|
+++ b/cmake/QtPrlHelpers.cmake
|
||
|
|
@@ -222,7 +222,7 @@ function(qt_internal_walk_libs
|
||
|
|
qt_internal_should_not_promote_package_target_to_global(
|
||
|
|
"${lib_target_unaliased}" should_not_promote)
|
||
|
|
if(NOT is_global AND is_imported AND NOT should_not_promote)
|
||
|
|
- set_property(TARGET ${lib_target_unaliased} PROPERTY IMPORTED_GLOBAL TRUE)
|
||
|
|
+ #set_property(TARGET ${lib_target_unaliased} PROPERTY IMPORTED_GLOBAL TRUE)
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
else()
|