diff options
author | Alexey Edelev <alexey.edelev@qt.io> | 2020-12-15 18:09:32 +0100 |
---|---|---|
committer | Alexey Edelev <alexey.edelev@qt.io> | 2020-12-21 13:41:13 +0100 |
commit | 56bdef94379479f27858dccc73a95614648735bb (patch) | |
tree | 3ad5f8f1a3fd2fc57486a42e01ce589f17e1c858 /cmake/QtSetup.cmake | |
parent | 50f939bfe8bdd63beca4aff06cbf1b2be1677624 (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
Pick-to: 6.0
Change-Id: Ib52bbd32478051d019a932dcb1f735e2d4aacfbf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
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() |