diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-16 07:08:06 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-21 09:01:39 +0200 |
| commit | 2a0585e7cbe4445b03752032de6f70f7c6b1ee0a (patch) | |
| tree | 0d35f5dc2e1adca0f5451b094a22f50be3d61122 | |
| parent | 8ef4edc09ea27ef301c866f812481cf0697cbfba (diff) | |
CMake: Port the 'pkg-config' feature
Change-Id: If571208aaaba8c1d0af834e8ae11869872d42135
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
| -rw-r--r-- | configure.cmake | 7 | ||||
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index 88c32e2637..ddb28060b6 100644 --- a/configure.cmake +++ b/configure.cmake @@ -356,6 +356,13 @@ qt_feature("use_lld_linker" DISABLE INPUT_linker STREQUAL 'bfd' OR INPUT_linker STREQUAL 'gold' ) qt_feature_config("use_lld_linker" QMAKE_PRIVATE_CONFIG) +qt_feature("pkg-config" PUBLIC + LABEL "Using pkg-config" + AUTODETECT NOT APPLE AND NOT WIN32 + CONDITION PKG_CONFIG_FOUND +) +qt_feature_config("pkg-config" QMAKE_PUBLIC_QT_CONFIG + NEGATE) qt_feature("developer-build" LABEL "Developer build" AUTODETECT OFF diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index e2ab8864f0..91ef573b3e 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -870,7 +870,7 @@ def get_feature_mapping(): "condition": "NOT WIN32 AND ( NOT WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )" }, "simulator_and_device": {"condition": "UIKIT AND NOT QT_UIKIT_SDK"}, - "pkg-config": None, + "pkg-config": {"condition": "PKG_CONFIG_FOUND"}, "posix-libiconv": { "condition": "NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND TEST_iconv_needlib", "enable": "TEST_posix_iconv AND TEST_iconv_needlib", |