diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-02-24 11:44:11 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-02-24 17:07:43 +0100 |
| commit | 599c648b77628fe195e78d6e7ac145f258f8880b (patch) | |
| tree | 3e2b0e42ec29044558f2e63688226c7a28da5864 | |
| parent | 27bd7e0093da00fcf425986bd1f58cdbfca1fe42 (diff) | |
CMake: Read QT_HOST_PATH from the environment too
For cross-compiled conan packages we need conan to export QT_HOST_PATH
as an environment variable. The Qt build now picks up this environment
variable if no QT_HOST_PATH cache variable was specified.
Pick-to: 6.2 6.3
Change-Id: I0c3e15e82842061d5db81949ffcc1c240f6ed6a4
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | cmake/QtSetup.cmake | 3 | ||||
| -rw-r--r-- | cmake/qt.toolchain.cmake.in | 14 |
2 files changed, 12 insertions, 5 deletions
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index 7db9612cd9..87d3ad9cf8 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -217,7 +217,8 @@ option(QT_BUILD_MANUAL_TESTS "Build Qt manual tests" OFF) option(QT_BUILD_MINIMAL_STATIC_TESTS "Build minimal subset of tests for static Qt builds" OFF) ## Find host tools (if non native): -set(QT_HOST_PATH "" CACHE PATH "Installed Qt host directory path, used for cross compiling.") +set(QT_HOST_PATH "$ENV{QT_HOST_PATH}" CACHE PATH + "Installed Qt host directory path, used for cross compiling.") if (CMAKE_CROSSCOMPILING) if(NOT IS_DIRECTORY "${QT_HOST_PATH}") diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in index 9054e9c4ef..6e37ae0281 100644 --- a/cmake/qt.toolchain.cmake.in +++ b/cmake/qt.toolchain.cmake.in @@ -167,10 +167,16 @@ set(__qt_toolchain_initial_qt_host_path set(__qt_toolchain_initial_qt_host_path_cmake_dir "@qt_host_path_cmake_dir_absolute@") -# Prefer initially configured path if none was explicitly set. -if(NOT DEFINED QT_HOST_PATH AND __qt_toolchain_initial_qt_host_path - AND EXISTS "${__qt_toolchain_initial_qt_host_path}") - set(QT_HOST_PATH "${__qt_toolchain_initial_qt_host_path}" CACHE PATH "") +# QT_HOST_PATH precedence: +# - cache variable / command line option +# - environment variable +# - initial QT_HOST_PATH when qtbase was configured (and the directory exists) +if(NOT DEFINED QT_HOST_PATH) + if(DEFINED ENV{QT_HOST_PATH}) + set(QT_HOST_PATH "$ENV{QT_HOST_PATH}" CACHE PATH "") + else(__qt_toolchain_initial_qt_host_path AND EXISTS "${__qt_toolchain_initial_qt_host_path}") + set(QT_HOST_PATH "${__qt_toolchain_initial_qt_host_path}" CACHE PATH "") + endif() endif() if(NOT QT_HOST_PATH STREQUAL "") |