diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-04 19:21:28 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-08-10 11:56:54 +0200 |
| commit | ecc72bc63ded553c8acb39b9e724502c76f2efb6 (patch) | |
| tree | 9bce7b785a9ad45436ba0d608a160d42db73e789 /util | |
| parent | 3c52f8af9dbc125eee22115910c25510df8fede0 (diff) | |
CMake: pro2cmake: Specify library versions for 3rd party libs part 2
Embed package versions into the qt_find_package calls for various
Linux specific packages.
Task-number: QTBUG-82917
Change-Id: I5d1cb623f81932dfae4658b8a3a89eedb71ea3af
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'util')
| -rw-r--r-- | util/cmake/helper.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/util/cmake/helper.py b/util/cmake/helper.py index eabd8e38b6..3e5ea031e4 100644 --- a/util/cmake/helper.py +++ b/util/cmake/helper.py @@ -398,7 +398,7 @@ _library_map = [ LibraryMapping("gbm", "gbm", "gbm::gbm"), LibraryMapping("glib", "GLIB2", "GLIB2::GLIB2"), LibraryMapping("iconv", "WrapIconv", "WrapIconv::WrapIconv"), - LibraryMapping("gtk3", "GTK3", "PkgConfig::GTK3"), + LibraryMapping("gtk3", "GTK3", "PkgConfig::GTK3", extra=["3.6"]), LibraryMapping("gssapi", "GSSAPI", "GSSAPI::GSSAPI"), LibraryMapping( "harfbuzz", "WrapHarfbuzz", "WrapHarfbuzz::WrapHarfbuzz", is_bundled_with_qt=True, @@ -473,7 +473,7 @@ _library_map = [ "xcb", "XCB", "XCB::XCB", - extra=["1.9"], + extra=["1.11"], resultVariable="TARGET XCB::XCB", appendFoundSuffix=False, ), @@ -481,16 +481,16 @@ _library_map = [ "xcb_glx", "XCB", "XCB::GLX", extra=["COMPONENTS", "GLX"], resultVariable="XCB_GLX" ), LibraryMapping( - "xcb_icccm", "XCB", "XCB::ICCCM", extra=["COMPONENTS", "ICCCM"], resultVariable="XCB_ICCCM" + "xcb_icccm", "XCB", "XCB::ICCCM", extra=["0.3.9", "COMPONENTS", "ICCCM"], resultVariable="XCB_ICCCM" ), LibraryMapping( - "xcb_image", "XCB", "XCB::IMAGE", extra=["COMPONENTS", "IMAGE"], resultVariable="XCB_IMAGE" + "xcb_image", "XCB", "XCB::IMAGE", extra=["0.3.9", "COMPONENTS", "IMAGE"], resultVariable="XCB_IMAGE" ), LibraryMapping( "xcb_keysyms", "XCB", "XCB::KEYSYMS", - extra=["COMPONENTS", "KEYSYMS"], + extra=["0.3.9", "COMPONENTS", "KEYSYMS"], resultVariable="XCB_KEYSYMS", ), LibraryMapping( @@ -507,7 +507,7 @@ _library_map = [ "xcb_renderutil", "XCB", "XCB::RENDERUTIL", - extra=["COMPONENTS", "RENDERUTIL"], + extra=["0.3.9", "COMPONENTS", "RENDERUTIL"], resultVariable="XCB_RENDERUTIL", ), LibraryMapping( @@ -544,7 +544,7 @@ _library_map = [ "xcb_xinput", "XCB", "XCB::XINPUT", - extra=["COMPONENTS", "XINPUT"], + extra=["1.12", "COMPONENTS", "XINPUT"], resultVariable="XCB_XINPUT", ), LibraryMapping( @@ -552,11 +552,11 @@ _library_map = [ ), LibraryMapping("xcb_xlib", "X11_XCB", "X11::XCB"), LibraryMapping("xcomposite", "XComposite", "PkgConfig::XComposite"), - LibraryMapping("xkbcommon_evdev", "XKB", "XKB::XKB", extra=["0.4.1"]), # see also xkbcommon - LibraryMapping("xkbcommon_x11", "XKB_COMMON_X11", "PkgConfig::XKB_COMMON_X11", extra=["0.4.1"]), - LibraryMapping("xkbcommon", "XKB", "XKB::XKB", extra=["0.4.1"]), + LibraryMapping("xkbcommon_evdev", "XKB", "XKB::XKB", extra=["0.5.0"]), # see also xkbcommon + LibraryMapping("xkbcommon_x11", "XKB_COMMON_X11", "PkgConfig::XKB_COMMON_X11", extra=["0.5.0"]), + LibraryMapping("xkbcommon", "XKB", "XKB::XKB", extra=["0.5.0"]), LibraryMapping("xlib", "X11", "X11::X11"), - LibraryMapping("xrender", "XRender", "PkgConfig::XRender"), + LibraryMapping("xrender", "XRender", "PkgConfig::XRender", extra=["0.6"]), LibraryMapping("zlib", "ZLIB", "ZLIB::ZLIB", extra=["1.0.8"]), LibraryMapping("zstd", "ZSTD", "ZSTD::ZSTD", extra=["1.3"]), LibraryMapping("tiff", "TIFF", "TIFF::TIFF"), |