diff options
| author | Niclas Rosenvik <nros@netbsd.org> | 2021-02-20 15:11:09 +0000 |
|---|---|---|
| committer | Niclas Rosenvik <nros@netbsd.org> | 2021-02-24 14:38:58 +0000 |
| commit | 96992c3f771c47f4333a907463de4688830cafd8 (patch) | |
| tree | 6c559415e4f223a01d3195fdc7081a886533343f /src/imageformats | |
| parent | 9e3f5efe50fe5f6925404c822eec9924b37194a4 (diff) | |
| download | qtimageformats-96992c3f771c47f4333a907463de4688830cafd8.tar.gz | |
Fix mng image plugin in cmake build
Add cmake/FindLibmng.cmake based on qtbase/cmake/FindLibb2.cmake .
Enable mng if found and link to the imported target provided by
FindLibmng.cmake so that mng can be used.
Libmng 1 did not come with a pkgconfig file and it is still
in use so FindLibmng will use the normal cmake procedures if
pkgconfig fails to find libmng.
Pick-to: 6.1
Change-Id: Iecf4ede700b1bfdab84c98c7333547f0bcecc6b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/imageformats')
| -rw-r--r-- | src/imageformats/configure.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imageformats/configure.cmake b/src/imageformats/configure.cmake index ab20ce8..b558769 100644 --- a/src/imageformats/configure.cmake +++ b/src/imageformats/configure.cmake @@ -17,6 +17,7 @@ set_property(CACHE INPUT_webp PROPERTY STRINGS undefined no qt system) qt_find_package(WrapJasper PROVIDED_TARGETS WrapJasper::WrapJasper MODULE_NAME imageformats QMAKE_LIB jasper) qt_find_package(TIFF PROVIDED_TARGETS TIFF::TIFF MODULE_NAME imageformats QMAKE_LIB tiff) qt_find_package(WrapWebP PROVIDED_TARGETS WrapWebP::WrapWebP MODULE_NAME imageformats QMAKE_LIB webp) +qt_find_package(Libmng PROVIDED_TARGETS Libmng::Libmng MODULE_NAME imageformats QMAKE_LIB mng) #### Tests @@ -33,7 +34,7 @@ qt_feature("jasper" PRIVATE qt_feature_definition("jasper" "QT_NO_IMAGEFORMAT_JASPER" NEGATE) qt_feature("mng" PRIVATE LABEL "MNG" - CONDITION libs.mng OR FIXME + CONDITION Libmng_FOUND DISABLE INPUT_mng STREQUAL 'no' ) qt_feature("tiff" PRIVATE |