(trafficserver) branch master updated: magick.so: explicitly reference wand/core libraries (#11183)

[bnolsen]

This is an automated email from the ASF dual-hosted git repository.

bnolsen 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 d90181f88c magick.so: explicitly reference wand/core libraries (#11183)
d90181f88c is described below

commit d90181f88c4093a9c204108d272f8b2e2d983a6f
Author: Brian Olsen <brian_ols...@comcast.com>
AuthorDate: Tue Mar 26 20:38:12 2024 -0600

    magick.so: explicitly reference wand/core libraries (#11183)
---
 CMakeLists.txt                             |  1 +
 cmake/magick_target.cmake                  | 16 ++++++++++++++++
 plugins/experimental/magick/CMakeLists.txt |  3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b2509604f..d6f6ac6474 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,6 +113,7 @@ auto_option(
   MagickWand
   MagickCore
 )
+
 auto_option(UNWIND FEATURE_VAR TS_USE_REMOTE_UNWINDING PACKAGE_DEPENDS unwind)
 
 # This creates the magic import target if necessary (older cmake)
diff --git a/cmake/magick_target.cmake b/cmake/magick_target.cmake
index 75aecca6ad..685298ca43 100644
--- a/cmake/magick_target.cmake
+++ b/cmake/magick_target.cmake
@@ -25,3 +25,19 @@ if(ImageMagick_Magick++_FOUND AND NOT TARGET 
ImageMagick::Magick++)
   target_compile_options(ImageMagick::Magick++ INTERFACE -fopenmp)
   target_compile_definitions(ImageMagick::Magick++ INTERFACE 
MAGICKCORE_HDRI_ENABLE=0 MAGICKCORE_QUANTUM_DEPTH=16)
 endif()
+
+if(ImageMagick_MagickWand_FOUND AND NOT TARGET ImageMagick::MagickWand)
+  add_library(ImageMagick::MagickWand INTERFACE IMPORTED)
+  target_include_directories(ImageMagick::MagickWand INTERFACE 
${ImageMagick_MagickWand_INCLUDE_DIRS})
+  target_link_libraries(ImageMagick::MagickWand INTERFACE 
${ImageMagick_LIBRARIES})
+  target_compile_options(ImageMagick::MagickWand INTERFACE -fopenmp)
+  target_compile_definitions(ImageMagick::MagickWand INTERFACE 
MAGICKCORE_HDRI_ENABLE=0 MAGICKCORE_QUANTUM_DEPTH=16)
+endif()
+
+if(ImageMagick_MagickCore_FOUND AND NOT TARGET ImageMagick::MagickCore)
+  add_library(ImageMagick::MagickCore INTERFACE IMPORTED)
+  target_include_directories(ImageMagick::MagickCore INTERFACE 
${ImageMagick_MagickCore_INCLUDE_DIRS})
+  target_link_libraries(ImageMagick::MagickCore INTERFACE 
${ImageMagick_LIBRARIES})
+  target_compile_options(ImageMagick::MagickCore INTERFACE -fopenmp)
+  target_compile_definitions(ImageMagick::MagickCore INTERFACE 
MAGICKCORE_HDRI_ENABLE=0 MAGICKCORE_QUANTUM_DEPTH=16)
+endif()
diff --git a/plugins/experimental/magick/CMakeLists.txt 
b/plugins/experimental/magick/CMakeLists.txt
index 205d3a5214..97d07452c5 100644
--- a/plugins/experimental/magick/CMakeLists.txt
+++ b/plugins/experimental/magick/CMakeLists.txt
@@ -16,6 +16,7 @@
 #######################
 
 add_atsplugin(magick magick.cc)
-target_link_libraries(magick PRIVATE ImageMagick::Magick++ ts::tscppapi 
OpenSSL::Crypto)
+
+target_link_libraries(magick PRIVATE ImageMagick::MagickWand 
ImageMagick::MagickCore ts::tscppapi OpenSSL::Crypto)
 
 verify_global_plugin(magick)