This is an automated email from the ASF dual-hosted git repository.
jvanderzee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 5538032a39 Restore webp_transform to build (#11469)
5538032a39 is described below
commit 5538032a39ae018a0e7f9ca0f3d25d4f9983e825
Author: JosiahWI <[email protected]>
AuthorDate: Fri Jun 21 11:20:05 2024 -0500
Restore webp_transform to build (#11469)
A bug was introduced in #10967 causing us not to register the auto_option
for webp_transform if the ImageMagick::Magick++ target already exists. None
of the other non-experimental plugins have auto_options at this time, so
this
demotes webp_transform to be always build if its dependency is found, in
line
with those other plugins.
---
plugins/CMakeLists.txt | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index d211528a43..6d9a27d813 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -65,20 +65,10 @@ endif()
# find_package() call to ensure the module doesn't try
# to create the same target twice.
if(NOT TARGET ImageMagick::Magick++)
- auto_option(
- WEBP_TRANSFORM
- FEATURE_VAR
- BUILD_WEBP_TRANSFORM
- PACKAGE_DEPENDS
- ImageMagick
- COMPONENTS
- Magick++
- )
-
- include(magick_target)
+ find_package(ImageMagick COMPONENTS Magick++)
endif()
-if(BUILD_WEBP_TRANSFORM)
+if(TARGET ImageMagick::Magick++)
add_subdirectory(webp_transform)
endif()
