summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosiah VanderZee <josiah_vanderzee@mediacombb.net>2024-06-21 12:02:53 (GMT)
committerBrad King <brad.king@kitware.com>2024-06-26 12:50:21 (GMT)
commit63bb3fca541c5775636aaf2e7ad306a539ba8661 (patch)
treefa0c48a35a6ac9859f02abdbaeda5d38c75cebd9
parentb83fabd0d3e29247618f6cd8e975894096e17a66 (diff)
downloadCMake-63bb3fca541c5775636aaf2e7ad306a539ba8661.zip
CMake-63bb3fca541c5775636aaf2e7ad306a539ba8661.tar.gz
CMake-63bb3fca541c5775636aaf2e7ad306a539ba8661.tar.bz2
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
-rw-r--r--Modules/FindImageMagick.cmake12
1 files 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()