summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2025-07-30 16:24:14 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2025-12-12 16:59:06 +0000
commitd8a94e92f2de08f9cbb83aaf43b0e187008ebcab (patch)
tree2fc6c43f4ab715fab0ad3528939139d35b867727 /src
parentb10840596ed5720f51b9ae691828c107a5430f40 (diff)
CMake: Generate vcpkg manifestHEADdev
Annotate qt_find_package calls for vcpkg.json generation. Pick-to: 6.11 Task-number: QTBUG-73760 Change-Id: I7a95bddd9c17a2d8c457a0582dd68347d06e48da Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imageformats/configure.cmake18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/imageformats/configure.cmake b/src/imageformats/configure.cmake
index c5cc214..742025a 100644
--- a/src/imageformats/configure.cmake
+++ b/src/imageformats/configure.cmake
@@ -17,15 +17,27 @@ set_property(CACHE INPUT_webp PROPERTY STRINGS undefined no qt system)
#### Libraries
-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(WrapJasper PROVIDED_TARGETS WrapJasper::WrapJasper MODULE_NAME imageformats
+ QMAKE_LIB jasper
+ VCPKG_PORT jasper
+ VCPKG_ADD_TO_FEATURE jasper
+)
+qt_find_package(TIFF PROVIDED_TARGETS TIFF::TIFF MODULE_NAME imageformats QMAKE_LIB tiff
+ VCPKG_PORT tiff
+ VCPKG_ADD_TO_FEATURE tiff
+ VCPKG_DEFAULT_FEATURES OFF
+)
# Threads::Threads might be brought in via a top-level CMakeLists.txt find_package dependency
# in which case if the system WebpConfig.cmake depends Threads, it shouldn't try to promote it to
# global to avoid a 'global promotion of a target in a different subdirectory' error.
if(TARGET Threads::Threads)
qt_internal_disable_find_package_global_promotion(Threads::Threads)
endif()
-qt_find_package(WrapWebP PROVIDED_TARGETS WrapWebP::WrapWebP MODULE_NAME imageformats QMAKE_LIB webp)
+qt_find_package(WrapWebP PROVIDED_TARGETS WrapWebP::WrapWebP MODULE_NAME imageformats
+ QMAKE_LIB webp
+ VCPKG_PORT libwebp
+ VCPKG_ADD_TO_FEATURE webp
+)
qt_find_package(Libmng PROVIDED_TARGETS Libmng::Libmng MODULE_NAME imageformats QMAKE_LIB mng)