From fa100f40fcce330e3d8367620bdeb5ddf0ee2732 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 27 May 2021 14:13:08 +0200 Subject: Enable compilation of the Qt Multimedia module in CI And fix a couple of smaller issues found by CI. Add some hacks/workarounds for issues with gstreamer packages and packageconfig files. Disable compilation of the QNX backend (as it's broken currently), and use the wnf and wmsdk feature tests to determine whether to compile the windows backend. Change-Id: I12f8983132f50b337cb15eb473d87299d3259745 Reviewed-by: Volker Hilsheimer --- cmake/FindGObject.cmake | 1 + cmake/FindGStreamer.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+) (limited to 'cmake') diff --git a/cmake/FindGObject.cmake b/cmake/FindGObject.cmake index 0880665fd..dc207a2ca 100644 --- a/cmake/FindGObject.cmake +++ b/cmake/FindGObject.cmake @@ -15,6 +15,7 @@ include(CMakeFindDependencyMacro) find_dependency(GLIB2) +qt_internal_disable_find_package_global_promotion(GLIB2::GLIB2) if(NOT TARGET GObject::GObject) find_package(PkgConfig QUIET) diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake index ef9edd485..0624c1a77 100644 --- a/cmake/FindGStreamer.cmake +++ b/cmake/FindGStreamer.cmake @@ -138,3 +138,14 @@ if(GStreamer_FOUND AND NOT TARGET GStreamer::GStreamer) GStreamer::Allocators ) endif() + +if(TARGET PkgConfig::PC_GSTREAMER_GL) + get_target_property(_qt_incs PkgConfig::PC_GSTREAMER_GL INTERFACE_INCLUDE_DIRECTORIES) + set(__qt_fixed_incs) + foreach(path IN LISTS _qt_incs) + if(IS_DIRECTORY "${path}") + list(APPEND __qt_fixed_incs "${path}") + endif() + endforeach() + set_property(TARGET PkgConfig::PC_GSTREAMER_GL PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${__qt_fixed_incs}") +endif() -- cgit v1.2.1