diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-25 19:29:52 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-01-26 17:16:04 +0100 |
| commit | 114d5c045da872be8cd304949c86b9e9655af2bf (patch) | |
| tree | b69357a5e0f14460618361fc8b5e878930dc9cd9 /cmake/QtSetup.cmake | |
| parent | b69b04c4790f319104a1098147cea9405b6e7062 (diff) | |
Fix invalid Qt prefix version when looking for HostInfo module
In QtSetup.cmake the PROJECT_VERSION_MAJOR variable was used to
identify prefix of 'Qt<version>HostInfoConfig.cmake'.
Qt<version>HostInfo is not found, if project version differs
from qtbase version.
Move the 'INSTALL_CMAKE_NAMESPACE' and 'QT_CMAKE_EXPORT_NAMESPACE'
variables to 'QtBuildInternalsConfig.cmake'. In this case
variables will be exposed for a wider list of internal routines.
Use the 'INSTALL_CMAKE_NAMESPACE' variable as prefix to find
Qt<version>HostInfo module.
Fixes: QTBUG-90345
Change-Id: Ic595d1c5beb74f34e69b58e18590a3afc2f346f7
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index c9ed45d5e8..256206a99d 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -175,7 +175,7 @@ if (CMAKE_CROSSCOMPILING) endif() if(NOT "${QT_HOST_PATH}" STREQUAL "") - find_package(Qt${PROJECT_VERSION_MAJOR}HostInfo + find_package(${INSTALL_CMAKE_NAMESPACE}HostInfo CONFIG REQUIRED PATHS "${QT_HOST_PATH}" |