From 56bdef94379479f27858dccc73a95614648735bb Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 15 Dec 2020 18:09:32 +0100 Subject: CMake: Use host variables instead of hardcoded directories 'QT_HOST_PATH' indicates that we use crosscompilation toolchain to build project. In this case 'Qt6Config.cmake' loads 'Qt6HostInfoConfig.cmake' from host QT_HOST_PATH, that defines correct paths to host tools. Replace hardcoded paths for host tools by paths recorded in Qt6HostInfoConfig.cmake. Correct conditions for QT_HOST_PATH, evaluate it explicitly as string, but not as boolean expression. Fixes: QTBUG-86557 Pick-to: 6.0 Change-Id: Ib52bbd32478051d019a932dcb1f735e2d4aacfbf Reviewed-by: Qt CI Bot Reviewed-by: Joerg Bornemann --- cmake/QtConfig.cmake.in | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'cmake/QtConfig.cmake.in') diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in index a43583e4cb..57c252091d 100644 --- a/cmake/QtConfig.cmake.in +++ b/cmake/QtConfig.cmake.in @@ -19,6 +19,16 @@ else() QT_VERSION_PATCH @PROJECT_VERSION_PATCH@) endif() +if(NOT "${QT_HOST_PATH}" STREQUAL "") + find_package(Qt@PROJECT_VERSION_MAJOR@HostInfo + CONFIG + REQUIRED + PATHS "${QT_HOST_PATH}" + "${QT_HOST_PATH_CMAKE_DIR}" + NO_CMAKE_FIND_ROOT_PATH + NO_DEFAULT_PATH) +endif() + # if (NOT @INSTALL_CMAKE_NAMESPACE@_FIND_COMPONENTS) # set(@INSTALL_CMAKE_NAMESPACE@_NOT_FOUND_MESSAGE "The Qt package requires at least one component") # set(@INSTALL_CMAKE_NAMESPACE@_FOUND False) -- cgit v1.2.3