Commit Graph

9 Commits

Author SHA1 Message Date
Lucie Gérard c47e029e79 Change the license of all CMakeLists.txt and *.cmake files to BSD
Task-number: QTBUG-105718
Change-Id: I3598499ab89b0e88718eded846306511000e8db9
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-08-25 10:17:22 +02:00
Lucie Gérard 238affae87 Add license headers to cmake files
CMakeLists.txt and .cmake files of significant size
(more than 2 lines according to our check in tst_license.pl)
now have the copyright and license header.

Existing copyright statements remain intact

Task-number: QTBUG-88621
Change-Id: Ifbf0be4c6f03259f9d084bbef4cf44fa60bf3fde
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-07-07 18:18:28 +02:00
Li Xinwei f8f40012ff FindWrapWebP.cmake: fix CMake warning
CMake Warning (dev) at .../cmake_64/share/cmake-3.19/Modules/
FindPackageHandleStandardArgs.cmake:426 (message):
The package name passed to `find_package_handle_standard_args` (WebP)
does not match the name of the calling package (WrapWebP).  This can
lead to problems in calling code that expects `find_package` result
variables (e.g., `_FOUND`) to follow a certain pattern.

Also, make find_package(PkgConfig) QUIET.

Pick-to: 6.1
Change-Id: Ib5daaab88f74272c638d40f8b51226ae9636fbad
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-20 22:06:13 +08:00
Joerg Bornemann 86ff21be22 FindWrap[Jasper|WebP].cmake: bail out on existing targets
Add the common bail out code we have in other FindWrap*.cmake files.

Pick-to: 6.1
Change-Id: I6096b31fcf6a2181b22b74ccf285ce22e14c197b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-17 09:00:02 +01:00
Niclas Rosenvik 96992c3f77 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>
2021-02-24 14:38:58 +00:00
Kai Köhne d1819dbd36 Fix linking of WebP through CMake API
The library target name is WebP::libwebpmux, not WebP::webpmux

[ChangeLog][Build System] Fixed an error that might have led to
not compiling webp plugin when configuring Qt yourself.

Pick-to: 6.0
Fixes: QTBUG-89280
Change-Id: Iaccad7d1b2ce580c6154d9bd01d5cc2d59ce7e56
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-12-10 13:07:59 +00:00
Alexandru Croitor 5a6f87a2d3 Adjust WebP Find module
Imageformats now also requires finding the mux library.

Change-Id: Iedd511e10aa8a10a67564cc7288baaf64d51e39f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-15 13:12:21 +00:00
Alexandru Croitor e970e4a394 Fix qtimageformats building
Some feature conditions were incorrect.
Added forgotten FindWrapWebP.cmake file.
Protect call to qt_find_package ZLIB.

Change-Id: I033d38e4f69e94f7b72346b49bf6de4b2dbde8e0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 13:45:05 +00:00
Alexandru Croitor 9443239c2c Initial CMake Port
Port 90% of imageformats to be built with CMake.

Missing support for mng plugin and documentation.

Change-Id: I1d7e4b93c6f8446468f00dbf0663a6a4ec8c9774
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-05-28 12:50:42 +00:00