summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-06-04 19:09:30 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-06-04 22:27:37 +0200
commit29be007837488f88fbc53625fb197b09c59742a8 (patch)
tree362667daa3853fd90b140857f8981fe778b2a539 /src
parent6c3aeda0bcf2b1362a390c49096b066366bd20b1 (diff)
CMake: Regenerate configure.cmake files
This will show the usual configure summary reports. Change-Id: I01d5cde762d47e7b7abbeda6fc331dde5cf9234b Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imageformats/configure.cmake18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/imageformats/configure.cmake b/src/imageformats/configure.cmake
index 3100bf6..0345752 100644
--- a/src/imageformats/configure.cmake
+++ b/src/imageformats/configure.cmake
@@ -14,9 +14,9 @@ set_property(CACHE INPUT_webp PROPERTY STRINGS undefined no qt system)
#### Libraries
-qt_find_package(WrapJasper PROVIDED_TARGETS WrapJasper::WrapJasper)
-qt_find_package(TIFF PROVIDED_TARGETS TIFF::TIFF)
-qt_find_package(WrapWebP PROVIDED_TARGETS WrapWebP::WrapWebP)
+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)
#### Tests
@@ -41,7 +41,7 @@ qt_feature("tiff" PRIVATE
CONDITION QT_FEATURE_imageformatplugin AND TIFF_FOUND
DISABLE INPUT_tiff STREQUAL 'no'
)
-qt_feature("system_tiff" PRIVATE
+qt_feature("system-tiff" PRIVATE
LABEL " Using system libtiff"
CONDITION QT_FEATURE_tiff AND TIFF_FOUND
ENABLE INPUT_tiff STREQUAL 'system'
@@ -52,9 +52,17 @@ qt_feature("webp" PRIVATE
CONDITION QT_FEATURE_imageformatplugin AND WrapWebP_FOUND
DISABLE INPUT_webp STREQUAL 'no'
)
-qt_feature("system_webp" PRIVATE
+qt_feature("system-webp" PRIVATE
LABEL " Using system libwebp"
CONDITION QT_FEATURE_webp AND WrapWebP_FOUND
ENABLE INPUT_webp STREQUAL 'system'
DISABLE INPUT_webp STREQUAL 'qt'
)
+qt_configure_add_summary_section(NAME "Further Image Formats")
+qt_configure_add_summary_entry(ARGS "jasper")
+qt_configure_add_summary_entry(ARGS "mng")
+qt_configure_add_summary_entry(ARGS "tiff")
+qt_configure_add_summary_entry(ARGS "system-tiff")
+qt_configure_add_summary_entry(ARGS "webp")
+qt_configure_add_summary_entry(ARGS "system-webp")
+qt_configure_end_summary_section() # end of "Further Image Formats" section