1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Port the 'pkg-config' feature

Browse Source 
Change-Id: If571208aaaba8c1d0af834e8ae11869872d42135
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
This commit is contained in:
Joerg Bornemann 2020-04-16 07:08:06 +02:00
parent 8ef4edc09e
commit 2a0585e7cb
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.cmake
View File

@ -356,6 +356,13 @@ qt_feature("use_lld_linker"
DISABLE INPUT_linker STREQUAL 'bfd' OR INPUT_linker STREQUAL 'gold' DISABLE INPUT_linker STREQUAL 'bfd' OR INPUT_linker STREQUAL 'gold'
) )
qt_feature_config("use_lld_linker" QMAKE_PRIVATE_CONFIG) 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" qt_feature("developer-build"
LABEL "Developer build" LABEL "Developer build"
AUTODETECT OFF AUTODETECT OFF

2
util/cmake/configurejson2cmake.py
View File

@ -870,7 +870,7 @@ def get_feature_mapping():
"condition": "NOT WIN32 AND ( NOT WATCHOS AND NOT QT_FEATURE_opengl_desktop AND GLESv2_FOUND )" "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"}, "simulator_and_device": {"condition": "UIKIT AND NOT QT_UIKIT_SDK"},
"pkg-config": None, "pkg-config": {"condition": "PKG_CONFIG_FOUND"},
"posix-libiconv": { "posix-libiconv": {
"condition": "NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND TEST_iconv_needlib", "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", "enable": "TEST_posix_iconv AND TEST_iconv_needlib",