From 96992c3f771c47f4333a907463de4688830cafd8 Mon Sep 17 00:00:00 2001 From: Niclas Rosenvik Date: Sat, 20 Feb 2021 15:11:09 +0000 Subject: 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 --- src/imageformats/configure.cmake | 3 ++- src/plugins/imageformats/CMakeLists.txt | 2 +- src/plugins/imageformats/mng/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') 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 diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt index 6f7cb49..d360c17 100644 --- a/src/plugins/imageformats/CMakeLists.txt +++ b/src/plugins/imageformats/CMakeLists.txt @@ -24,7 +24,7 @@ endif() if(QT_FEATURE_regularexpression) add_subdirectory(icns) endif() -if(QT_FEATURE_mng AND OFF) # special case: FIXME +if(QT_FEATURE_mng) add_subdirectory(mng) endif() if(QT_FEATURE_jasper) diff --git a/src/plugins/imageformats/mng/CMakeLists.txt b/src/plugins/imageformats/mng/CMakeLists.txt index 9b64cb7..dfb044d 100644 --- a/src/plugins/imageformats/mng/CMakeLists.txt +++ b/src/plugins/imageformats/mng/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_plugin(QMngPlugin main.cpp qmnghandler.cpp qmnghandler_p.h LIBRARIES - mng + Libmng::Libmng PUBLIC_LIBRARIES Qt::Core Qt::Gui -- cgit v1.2.1