mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 15:29:06 +08:00
147027390b
* [Qt6] update to 6.2.4
* adjust patches
* more fixes
* more CMAKE_REQUIRE_FIND_PACKAGE
* fix configure?
* cannot require cmake not config stuff.
* more REQUIRE removals
* adjust required stuff
* more modules.
* less require stuff
* disable env patch for now and silent the require maybe unused. warnings
* different approach
* fix case ?
* fix linux builds
* more stuff to not force in vcpkg
* reenable env patch
* only use env patch on windows.
* reenable qtwebengine. Maybe the ICE was fixed?
* Revert "reenable qtwebengine. Maybe the ICE was fixed?"
This reverts commit 5dc3ca88c1.
* version stuff
Co-authored-by: Alexander Neumann <you@example.com>
17 lines
979 B
Diff
17 lines
979 B
Diff
diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake
|
|
index 279ab07dd..951fd3d36 100644
|
|
--- a/cmake/QtTestHelpers.cmake
|
|
+++ b/cmake/QtTestHelpers.cmake
|
|
@@ -653,9 +653,9 @@ function(qt_internal_collect_command_environment out_path out_plugin_path)
|
|
# The regular CMAKE_INSTALL_PREFIX can be different for example when building standalone tests.
|
|
# Any given CMAKE_INSTALL_PREFIX takes priority over qt_relocatable_install_prefix for the
|
|
# PATH environment variable.
|
|
- set(install_prefixes "${CMAKE_INSTALL_PREFIX}")
|
|
+ set(install_prefixes "${CMAKE_INSTALL_PREFIX}$<$<CONFIG:DEBUG>:/debug>")
|
|
if(QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX)
|
|
- list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}")
|
|
+ list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}$<$<CONFIG:DEBUG>:/debug>")
|
|
endif()
|
|
|
|
file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" test_env_path)
|