diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-13 13:26:09 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-17 02:02:17 +0000 |
| commit | 6fb7f3de3bebcb2346feee2915f2239ab4854df2 (patch) | |
| tree | d0df21f27883a16e6c373d240863f28abc884876 /cmake | |
| parent | 8f68b4a070b6246af78884a5c41f830245174a66 (diff) | |
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 <joerg.bornemann@qt.io>
(cherry picked from commit 6ef3d070a8bad0cfba98fa241a8676401f21371f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtQmakeHelpers.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtQmakeHelpers.cmake b/cmake/QtQmakeHelpers.cmake index 47a41d9236..409c8a6cc8 100644 --- a/cmake/QtQmakeHelpers.cmake +++ b/cmake/QtQmakeHelpers.cmake @@ -71,7 +71,7 @@ function(qt_generate_qconfig_cpp in_file out_file) # 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) |