diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-11 11:49:00 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-12 08:51:25 +0100 |
| commit | cc3f693029d6fcc65a0153b658061bd121a6af66 (patch) | |
| tree | 473af6280c857efb7916147722ea868cb8213e39 /cmake/QtConfig.cmake.in | |
| parent | 94dd2cebdcb9446626cd32a00086431eb11ab2a4 (diff) | |
CMake: Do not set PKG_CONFIG_* environment variables
This reverts commit 9968a211f92c2b4d5bd1fe004f16ec1c5f968dcd.
The PKG_CONFIG_* environment variables should be added by the user
environment, preferably by the toolchain file.
Apparently, the change was added for Android before we turned off
pkg-config for Android. It is not needed anymore.
Change-Id: Ieeed09ae53a606c85d4937f463286b5b0f76bde9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtConfig.cmake.in')
| -rw-r--r-- | cmake/QtConfig.cmake.in | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in index d6d6d179d2..8a8f73b155 100644 --- a/cmake/QtConfig.cmake.in +++ b/cmake/QtConfig.cmake.in @@ -1,15 +1,5 @@ @PACKAGE_INIT@ -if (CMAKE_CROSSCOMPILING AND CMAKE_SYSROOT) - # When cross compiling with CMake any calls to pkg_check_modules() will - # search into the host system instead of the target sysroot. - # The current work around is based on the discussion found at - # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4478 - set(ENV{PKG_CONFIG_DIR} "") - set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_SYSROOT}/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig") - set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_SYSROOT}) -endif() - # Slightly amended version of ./src/corelib/Qt6Config.cmake.in if (CMAKE_VERSION VERSION_LESS 3.14) message(FATAL_ERROR "Qt requires at least CMake version 3.14") |