From c2bc42d64b2aa948e06385f0054e46f8c264fd1b Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Tue, 10 Jan 2023 15:00:39 +0100 Subject: [PATCH] Disable PkgConfig for Android We decided that it's better to disable PkgConfig for Android, as it is unlikely that someone uses them. Task-number: QTBUG-110007 Change-Id: I6ae1059ddd05feeec047fbb906c7dba1586e816b Reviewed-by: Alexey Edelev (cherry picked from commit e6693163e5e40668bc4cc5155003c173eea83273) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPkgConfigHelpers.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/QtPkgConfigHelpers.cmake b/cmake/QtPkgConfigHelpers.cmake index 08261e21a2a..370ff607c4f 100644 --- a/cmake/QtPkgConfigHelpers.cmake +++ b/cmake/QtPkgConfigHelpers.cmake @@ -22,7 +22,8 @@ endmacro() # Create a Qt6*.pc file intended for pkg-config consumption. function(qt_internal_generate_pkg_config_file module) # TODO: PkgConfig is supported under MSVC with pkgconf (github.com/pkgconf/pkgconf) - if((NOT UNIX OR QT_FEATURE_framework) AND NOT MINGW OR CMAKE_VERSION VERSION_LESS "3.20") + if((NOT UNIX OR QT_FEATURE_framework) + AND NOT MINGW OR CMAKE_VERSION VERSION_LESS "3.20" OR ANDROID) return() endif() if(NOT BUILD_SHARED_LIBS)