Go to file
Alexandru Croitor 9e044765ec CMake: Fix empty value of CMAKE_SIZEOF_VOID_P when looking for tools
Our initial approach to looking for host Qt tools when cross-compiling
to a platform with a different architecture bitness compared to the
host one was to unset CMAKE_SIZEOF_VOID_P before calling
find_package(Qt6FooTools) and then restoring the value.

That works to bypass the architecture bitness test in the
ConfigVersion files, but it also influences the paths that
find_package() searches in, specifically the lib<arch> paths like
/usr/lib64 will not be searched in.

Fortunately since CMake 3.14, write_basic_package_version_file() can
take an additional ARCH_INDEPENDENT parameter. This disables the
architecture bitness test when looking for the package, while allowing
to still search in the /usr/lib64 like paths.

Use it when creating the QtFooToolConfigVersion.cmake files.

One could argue we should actually check if the tool executables could
run on the host system where find_package is called for
cross-compilation.
We could do that in another change if the problem ever arises.

Amends 03aa74e40d
Amends 914b367c7f

Change-Id: I1181ff637ac80064a6a8538170b28a41743fc90c
Fixes: QTBUG-81672
Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-13 19:45:29 +02:00
.github/workflows Update configure flags to the last fixes 2020-06-30 15:21:32 +02:00
bin Add OS-specific prelude to qt-cmake-standalone-test 2020-07-15 15:13:05 +00:00
cmake CMake: Fix empty value of CMAKE_SIZEOF_VOID_P when looking for tools 2020-08-13 19:45:29 +02:00
coin CMake: Use CMAKE_AUTOGEN_VERBOSE to see moc invocations 2020-07-24 17:33:17 +02:00
config.tests CMake: Skip regeneration of manual compile test project 2020-04-09 11:26:46 +02:00
dist Remove last remainings of Qt Quick 1 imports 2020-05-25 11:48:12 +02:00
doc Fix return of uninitialized pointer in guiloader example 2020-07-16 21:52:26 +02:00
examples Don't depend on tools for the qtestlib examples 2020-08-12 19:37:15 +02:00
lib
mkspecs configure: Explicitly enable float-divide-by-zero with ubsan 2020-08-07 01:21:07 +02:00
qmake Long Live QMap as a refcounted std::map! 2020-08-06 19:15:39 +02:00
src De-inline QIODevice::write(const QByteArray &) 2020-08-13 20:37:50 +03:00
tests Fix conversions to JSON from QVariant 2020-08-13 19:36:58 +02:00
util Add quickcontrols2impl to helper.py 2020-08-13 19:31:59 +02:00
.cmake.conf pro2cmake.py: Generate .cmake.conf files for versioning 2020-04-30 17:44:03 +00:00
.gitattributes
.gitignore git: Ignore CMakeLists.txt.user 2020-07-24 17:26:51 +02:00
.lgtm.yml Skip LGTM analysis for the bootstrap library and tools 2020-07-16 01:04:34 +02:00
.qmake.conf Bump version 2019-12-17 12:41:31 +01:00
.tag
CMakeLists.txt CMake: fix android target build not picking the correct sysroot 2020-08-13 17:31:59 +00:00
config_help.txt Make -qtlibinfix affect the names of plugins by default 2020-07-13 20:30:18 +02:00
configure CMake: Fix top-level configure 2020-07-16 15:00:37 +02:00
configure.bat CMake: Fix top-level configure 2020-07-16 15:00:37 +02:00
configure.cmake CMake: pro2cmake: Specify library versions for 3rd party libraries 2020-08-10 11:56:54 +02:00
configure.json Make -qtlibinfix affect the names of plugins by default 2020-07-13 20:30:18 +02:00
configure.pri Treat -xplatform or -device-option as being a cross compilation 2020-07-08 19:18:09 +02:00
dependencies.yaml Re-add dependencies.yaml so repos outside qt5 can be built with Coin 2019-09-19 17:07:36 +00:00
header.BSD
header.COMM
header.FDL
header.GPL
header.GPL-EXCEPT
header.LGPL
header.LGPL3
header.LGPL3-COMM
header.LGPL-NOGPL2
header.LGPL-ONLY
header.MIT
INSTALL INSTALL: Remove outdated reference to Windows CE 2019-02-13 13:01:57 +00:00
LICENSE.FDL
LICENSE.GPL2
LICENSE.GPL3
LICENSE.GPL3-EXCEPT
LICENSE.LGPL3
LICENSE.LGPLv3
LICENSE.QT-LICENSE-AGREEMENT Update enterprise license agreement v4.2.1 2019-12-18 13:07:19 +02:00
qtbase.pro
sync.profile Remove last remaining bits of QtPlatformHeaders 2020-08-04 07:12:32 +02:00