From dec5cfcd4ba2940ece4d92f70b1b2268729f6f6b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 10 Feb 2021 10:12:59 +0200 Subject: [PATCH] CMake: setup windows tools path only when building on Windows Fix cross-compilation on Linux host. Task-number: QTBUG-91052 Change-Id: I48c970f0e6af71e3eda3818557e764f60d3836ad Reviewed-by: Juha Vuolle Reviewed-by: Ulf Hermann Reviewed-by: Joerg Bornemann (cherry picked from commit 24d2215b67e1875046aa8c856751260f4356453f) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index d9b8685fa59..3c151c8dbc2 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -252,7 +252,7 @@ set(CMAKE_INSTALL_RPATH "" CACHE STRING "RPATH for installed binaries") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) function(qt_setup_tool_path_command) - if(NOT WIN32) + if(NOT CMAKE_HOST_WIN32) return() endif() set(bindir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}")