diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2020-12-15 18:09:32 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-21 15:38:08 +0000 |
| commit | f815382114bce9c28468a770a6b6e342619b15c2 (patch) | |
| tree | 25c8babcf44bc010b3f848d3d76262b984fc3089 /cmake/QtSetup.cmake | |
| parent | 701934d39f50892273b733b55040b550568ca635 (diff) | |
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
Change-Id: Ib52bbd32478051d019a932dcb1f735e2d4aacfbf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 56bdef94379479f27858dccc73a95614648735bb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake/QtSetup.cmake')
| -rw-r--r-- | cmake/QtSetup.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index 13daf40381..e08ce69947 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -174,11 +174,12 @@ if (CMAKE_CROSSCOMPILING) endif() endif() -if(QT_HOST_PATH) +if(NOT "${QT_HOST_PATH}" STREQUAL "") find_package(Qt${PROJECT_VERSION_MAJOR}HostInfo CONFIG REQUIRED - PATHS "${QT_HOST_PATH}" "${QT_HOST_PATH}/lib/cmake" + PATHS "${QT_HOST_PATH}" + "${QT_HOST_PATH_CMAKE_DIR}" NO_CMAKE_FIND_ROOT_PATH NO_DEFAULT_PATH) endif() |