From 4d0db58c202e97b33b2f5784091905c0053f670c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 13 Aug 2021 13:26:09 +0200 Subject: [PATCH] CMake: Replace usage of WIN32 with CMAKE_HOST_WIN32 in qconfig.cpp The workaround of adding a drive letter to QT_CONFIGURE_PREFIX_PATH_STR should be done when running on any Windows host, not only when targeting Windows. Amends 59c3be711728ab0aa644bfdf50e91a1b020f95bb Task-number: QTBUG-87580 Change-Id: Ic6ca50aa58a4a54fb483e90fe61a907fe86cb002 Reviewed-by: Joerg Bornemann (cherry picked from commit 6ef3d070a8bad0cfba98fa241a8676401f21371f) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtQmakeHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtQmakeHelpers.cmake b/cmake/QtQmakeHelpers.cmake index 30db68170fc..52d10d8dc05 100644 --- a/cmake/QtQmakeHelpers.cmake +++ b/cmake/QtQmakeHelpers.cmake @@ -103,7 +103,7 @@ function(qt_generate_qconfig_cpp) # C:/work/qt/install # so it includes a drive letter and forward slashes. set(QT_CONFIGURE_PREFIX_PATH_STR "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}") - if(WIN32) + if(CMAKE_HOST_WIN32) get_filename_component( QT_CONFIGURE_PREFIX_PATH_STR "${QT_CONFIGURE_PREFIX_PATH_STR}" REALPATH)