From c96422ae949b151399be50d606cc40ecfb7e6ddb Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 16 Mar 2020 17:07:41 +0100 Subject: CMake: Regenerate and fixup qtimageformats projects A few changes happened since last update: - CMake target names are now consistent with Qt 5 names - ZLIB handling - TIFF 3rd party handling - Standalone tests simplification - Updates in the SUBDIRS project - Other minor changes Change-Id: I85cca79d38feca44c5b78dae48c79779ae05e288 Reviewed-by: Simon Hausmann --- src/plugins/imageformats/CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/plugins/imageformats/CMakeLists.txt') diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt index 01855f4..6f7cb49 100644 --- a/src/plugins/imageformats/CMakeLists.txt +++ b/src/plugins/imageformats/CMakeLists.txt @@ -10,14 +10,12 @@ include(../../imageformats/configure.cmake) qt_feature_module_end(NO_MODULE) # special case end -if(NOT WINRT) - add_subdirectory(tga) -endif() +add_subdirectory(tga) add_subdirectory(wbmp) -if(QT_FEATURE_tiff AND NOT WINRT) +if(QT_FEATURE_tiff) add_subdirectory(tiff) endif() -if(QT_FEATURE_webp AND NOT WINRT) +if(QT_FEATURE_webp) add_subdirectory(webp) endif() if(APPLE) @@ -26,7 +24,7 @@ endif() if(QT_FEATURE_regularexpression) add_subdirectory(icns) endif() -if(QT_FEATURE_mng AND OFF) # special case TODO: FiXME +if(QT_FEATURE_mng AND OFF) # special case: FIXME add_subdirectory(mng) endif() if(QT_FEATURE_jasper) @@ -35,4 +33,3 @@ endif() if(APPLE AND NOT QT_FEATURE_jasper) add_subdirectory(macjp2) endif() - -- cgit v1.2.3