From 63bb3fca541c5775636aaf2e7ad306a539ba8661 Mon Sep 17 00:00:00 2001 From: Josiah VanderZee Date: Fri, 21 Jun 2024 07:02:53 -0500 Subject: FindImageMagick: Allow including multiple times This prevents attempting to create a duplicate target by adding an `if(NOT TARGET ...)` check as in other modules. The condition was missed in commit 1bba218214 (FindImageMagick: Define targets for specific components, 2023-01-20, v3.26.0-rc1~23^2). Fixes: #25970 --- Modules/FindImageMagick.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake index 6baf471..b2926ba 100644 --- a/Modules/FindImageMagick.cmake +++ b/Modules/FindImageMagick.cmake @@ -185,11 +185,13 @@ function(FIND_IMAGEMAGICK_API component header) ) set(ImageMagick_COMPILE_OPTIONS ${ImageMagick_COMPILE_OPTIONS} PARENT_SCOPE) - add_library(ImageMagick::${component} UNKNOWN IMPORTED) - set_target_properties(ImageMagick::${component} PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${ImageMagick_${component}_INCLUDE_DIRS}" - INTERFACE_COMPILE_OPTIONS "${ImageMagick_${component}_COMPILE_OPTIONS}" - IMPORTED_LOCATION "${ImageMagick_${component}_LIBRARY}") + if(NOT TARGET ImageMagick::${component}) + add_library(ImageMagick::${component} UNKNOWN IMPORTED) + set_target_properties(ImageMagick::${component} PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${ImageMagick_${component}_INCLUDE_DIRS}" + INTERFACE_COMPILE_OPTIONS "${ImageMagick_${component}_COMPILE_OPTIONS}" + IMPORTED_LOCATION "${ImageMagick_${component}_LIBRARY}") + endif() endif() endfunction() -- cgit v0.12