diff options
| author | André de la Rocha <andre.rocha@qt.io> | 2021-09-23 06:32:49 +0200 |
|---|---|---|
| committer | André de la Rocha <andre.rocha@qt.io> | 2021-09-24 18:38:39 +0200 |
| commit | a199c508b82644fddfbf9a2b3c7e03433e81bc5d (patch) | |
| tree | 0fedd3e7b800673e70b7ffa73c54f6edf425122d /cmake | |
| parent | 5f76df5814c3e23261cc7ef12819c1c0a408e9ef (diff) | |
Add support for building WMF backend with MinGW 9.0.0
Allows building QtMultimedia with a working Microsoft Media Foundation
backend, using MinGW 9.0.0, which has better support for WMF. Also
fixes warnings generated by newer GCC releases.
Pick-to: 6.2
Fixes: QTBUG-95234
Change-Id: I76e68c3b8dc4240f63543bbbb73a233289c67421
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindWMF.cmake | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/cmake/FindWMF.cmake b/cmake/FindWMF.cmake index 5ace0923f..7c6923c1e 100644 --- a/cmake/FindWMF.cmake +++ b/cmake/FindWMF.cmake @@ -15,25 +15,28 @@ # ``WMF::WMF`` # The Windows Media Foundation library to link to -find_library(WMF_STMIIDS_LIBRARY strmiids) -find_library(WMF_DMOGUIDS_LIBRARY dmoguids) -find_library(WMF_UUID_LIBRARY uuid) -find_library(WMF_MSDMO_LIBRARY msdmo) -find_library(WMF_OLE32_LIBRARY ole32) -find_library(WMF_OLEAUT32_LIBRARY oleaut32) -find_library(WMF_MF_LIBRARY Mf) -find_library(WMF_MFUUID_LIBRARY Mfuuid) -find_library(WMF_MFPLAT_LIBRARY Mfplat) -find_library(WMF_PROPSYS_LIBRARY Propsys) +find_library(WMF_STRMIIDS_LIBRARY strmiids HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_AMSTRMID_LIBRARY amstrmid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_DMOGUIDS_LIBRARY dmoguids HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_UUID_LIBRARY uuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_MSDMO_LIBRARY msdmo HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_OLE32_LIBRARY ole32 HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_OLEAUT32_LIBRARY oleaut32 HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_MF_LIBRARY Mf HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_MFUUID_LIBRARY Mfuuid HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_MFPLAT_LIBRARY Mfplat HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_MFCORE_LIBRARY Mfcore HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) +find_library(WMF_PROPSYS_LIBRARY Propsys HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) -set(WMF_LIBRARIES ${WMF_STMIIDS_LIBRARY} ${WMF_DMOGUIDS_LIBRARY} ${WMF_UUID_LIBRARY} ${WMF_MSDMO_LIBRARY} - ${WMF_OLE32_LIBRARY} ${WMF_OLEAUT32_LIBRARY} ${WMF_MF_LIBRARY} - ${WMF_MFUUID_LIBRARY} ${WMF_MFPLAT_LIBRARY} ${WMF_PROPSYS_LIBRARY}) + +set(WMF_LIBRARIES ${WMF_STRMIIDS_LIBRARY} ${WMF_AMSTRMID_LIBRARY} ${WMF_DMOGUIDS_LIBRARY} ${WMF_UUID_LIBRARY} + ${WMF_MSDMO_LIBRARY} ${WMF_OLE32_LIBRARY} ${WMF_OLEAUT32_LIBRARY} ${WMF_MF_LIBRARY} + ${WMF_MFUUID_LIBRARY} ${WMF_MFPLAT_LIBRARY} ${WMF_MFCORE_LIBRARY} ${WMF_PROPSYS_LIBRARY}) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(WMF REQUIRED_VARS - WMF_STMIIDS_LIBRARY WMF_DMOGUIDS_LIBRARY WMF_UUID_LIBRARY WMF_MSDMO_LIBRARY - WMF_OLE32_LIBRARY WMF_OLEAUT32_LIBRARY WMF_MF_LIBRARY - WMF_MFUUID_LIBRARY WMF_MFPLAT_LIBRARY WMF_PROPSYS_LIBRARY) + WMF_STRMIIDS_LIBRARY WMF_AMSTRMID_LIBRARY WMF_DMOGUIDS_LIBRARY WMF_UUID_LIBRARY + WMF_MSDMO_LIBRARY WMF_OLE32_LIBRARY WMF_OLEAUT32_LIBRARY WMF_MF_LIBRARY + WMF_MFUUID_LIBRARY WMF_MFPLAT_LIBRARY WMF_MFCORE_LIBRARY WMF_PROPSYS_LIBRARY) if(WMF_FOUND AND NOT TARGET WMF::WMF) add_library(WMF::WMF INTERFACE IMPORTED) |