This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 2c80cb342fa2ea546c4a058b13482bb084baefcc Author: Brian Olsen <[email protected]> AuthorDate: Tue Mar 26 20:38:12 2024 -0600 magick.so: explicitly reference wand/core libraries (#11183) (cherry picked from commit d90181f88c4093a9c204108d272f8b2e2d983a6f) --- 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 7d9e4c4c7c..2bb2148ee1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,6 +112,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)
