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/plugins | |
| 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/plugins')
| -rw-r--r-- | src/plugins/imageformats/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/mng/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
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 |