diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindImageMagick.cmake | 23 | ||||
| -rw-r--r-- | Modules/FindProtobuf.cmake | 54 |
2 files changed, 43 insertions, 34 deletions
diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake index 0561a3d..7d5534b 100644 --- a/Modules/FindImageMagick.cmake +++ b/Modules/FindImageMagick.cmake @@ -102,7 +102,7 @@ function(FIND_IMAGEMAGICK_API component header) ${ImageMagick_INCLUDE_DIRS} "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" PATH_SUFFIXES - ImageMagick ImageMagick-6 + ImageMagick ImageMagick-6 ImageMagick-7 DOC "Path to the ImageMagick arch-independent include dir." ) find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR @@ -114,7 +114,7 @@ function(FIND_IMAGEMAGICK_API component header) ${ImageMagick_INCLUDE_DIRS} "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" PATH_SUFFIXES - ImageMagick ImageMagick-6 + ImageMagick ImageMagick-6 ImageMagick-7 DOC "Path to the ImageMagick arch-specific include dir." ) find_library(ImageMagick_${component}_LIBRARY @@ -195,17 +195,26 @@ foreach(component ${ImageMagick_FIND_COMPONENTS} ) if(component STREQUAL "Magick++") FIND_IMAGEMAGICK_API(Magick++ Magick++.h - Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI + Magick++ CORE_RL_Magick++_ + Magick++-Q8 Magick++-Q16 Magick++-Q16HDRI Magick++-Q8HDRI + Magick++-6.Q16 Magick++-6.Q8 Magick++-6.Q16HDRI Magick++-6.Q8HDRI + Magick++-7.Q16 Magick++-7.Q8 Magick++-7.Q16HDRI Magick++-7.Q8HDRI ) list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) elseif(component STREQUAL "MagickWand") - FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h - Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI + FIND_IMAGEMAGICK_API(MagickWand "wand/MagickWand.h;MagickWand/MagickWand.h" + Wand MagickWand CORE_RL_wand_ + MagickWand-Q16 MagickWand-Q8 MagickWand-Q16HDRI MagickWand-Q8HDRI + MagickWand-6.Q16 MagickWand-6.Q8 MagickWand-6.Q16HDRI MagickWand-6.Q8HDRI + MagickWand-7.Q16 MagickWand-7.Q8 MagickWand-7.Q16HDRI MagickWand-7.Q8HDRI ) list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) elseif(component STREQUAL "MagickCore") - FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h - Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI + FIND_IMAGEMAGICK_API(MagickCore "magick/MagickCore.h;MagickCore/MagickCore.h" + Magick MagickCore CORE_RL_magick_ + MagickCore-Q16 MagickCore-Q8 MagickCore-Q16HDRI MagickCore-Q8HDRI + MagickCore-6.Q16 MagickCore-6.Q8 MagickCore-6.Q16HDRI MagickCore-6.Q8HDRI + MagickCore-7.Q16 MagickCore-7.Q8 MagickCore-7.Q16HDRI MagickCore-7.Q8HDRI ) list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY) else() diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake index 6dc0444..abc7518 100644 --- a/Modules/FindProtobuf.cmake +++ b/Modules/FindProtobuf.cmake @@ -42,11 +42,11 @@ # # The following :prop_tgt:`IMPORTED` targets are also defined: # -# ``Protobuf::protobuf`` +# ``protobuf::libprotobuf`` # The protobuf library. -# ``Protobuf::protobuf-lite`` +# ``protobuf::libprotobuf-lite`` # The protobuf lite library. -# ``Protobuf::protoc`` +# ``protobuf::libprotoc`` # The protoc library. # # The following cache variables are also available to set or use: @@ -420,72 +420,72 @@ if(Protobuf_INCLUDE_DIR) endif() if(Protobuf_LIBRARY) - if(NOT TARGET Protobuf::protobuf) - add_library(Protobuf::protobuf UNKNOWN IMPORTED) - set_target_properties(Protobuf::protobuf PROPERTIES + if(NOT TARGET protobuf::libprotobuf) + add_library(protobuf::libprotobuf UNKNOWN IMPORTED) + set_target_properties(protobuf::libprotobuf PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}") if(EXISTS "${Protobuf_LIBRARY}") - set_target_properties(Protobuf::protobuf PROPERTIES + set_target_properties(protobuf::libprotobuf PROPERTIES IMPORTED_LOCATION "${Protobuf_LIBRARY}") endif() if(EXISTS "${Protobuf_LIBRARY_RELEASE}") - set_property(TARGET Protobuf::protobuf APPEND PROPERTY + set_property(TARGET protobuf::libprotobuf APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - set_target_properties(Protobuf::protobuf PROPERTIES + set_target_properties(protobuf::libprotobuf PROPERTIES IMPORTED_LOCATION_RELEASE "${Protobuf_LIBRARY_RELEASE}") endif() if(EXISTS "${Protobuf_LIBRARY_DEBUG}") - set_property(TARGET Protobuf::protobuf APPEND PROPERTY + set_property(TARGET protobuf::libprotobuf APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - set_target_properties(Protobuf::protobuf PROPERTIES + set_target_properties(protobuf::libprotobuf PROPERTIES IMPORTED_LOCATION_DEBUG "${Protobuf_LIBRARY_DEBUG}") endif() endif() endif() if(Protobuf_LITE_LIBRARY) - if(NOT TARGET Protobuf::protobuf-lite) - add_library(Protobuf::protobuf-lite UNKNOWN IMPORTED) - set_target_properties(Protobuf::protobuf-lite PROPERTIES + if(NOT TARGET protobuf::libprotobuf-lite) + add_library(protobuf::libprotobuf-lite UNKNOWN IMPORTED) + set_target_properties(protobuf::libprotobuf-lite PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}") if(EXISTS "${Protobuf_LITE_LIBRARY}") - set_target_properties(Protobuf::protobuf-lite PROPERTIES + set_target_properties(protobuf::libprotobuf-lite PROPERTIES IMPORTED_LOCATION "${Protobuf_LITE_LIBRARY}") endif() if(EXISTS "${Protobuf_LITE_LIBRARY_RELEASE}") - set_property(TARGET Protobuf::protobuf-lite APPEND PROPERTY + set_property(TARGET protobuf::libprotobuf-lite APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - set_target_properties(Protobuf::protobuf-lite PROPERTIES + set_target_properties(protobuf::libprotobuf-lite PROPERTIES IMPORTED_LOCATION_RELEASE "${Protobuf_LITE_LIBRARY_RELEASE}") endif() if(EXISTS "${Protobuf_LITE_LIBRARY_DEBUG}") - set_property(TARGET Protobuf::protobuf-lite APPEND PROPERTY + set_property(TARGET protobuf::libprotobuf-lite APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - set_target_properties(Protobuf::protobuf-lite PROPERTIES + set_target_properties(protobuf::libprotobuf-lite PROPERTIES IMPORTED_LOCATION_DEBUG "${Protobuf_LITE_LIBRARY_DEBUG}") endif() endif() endif() if(Protobuf_PROTOC_LIBRARY) - if(NOT TARGET Protobuf::protoc) - add_library(Protobuf::protoc UNKNOWN IMPORTED) - set_target_properties(Protobuf::protoc PROPERTIES + if(NOT TARGET protobuf::libprotoc) + add_library(protobuf::libprotoc UNKNOWN IMPORTED) + set_target_properties(protobuf::libprotoc PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}") if(EXISTS "${Protobuf_PROTOC_LIBRARY}") - set_target_properties(Protobuf::protoc PROPERTIES + set_target_properties(protobuf::libprotoc PROPERTIES IMPORTED_LOCATION "${Protobuf_PROTOC_LIBRARY}") endif() if(EXISTS "${Protobuf_PROTOC_LIBRARY_RELEASE}") - set_property(TARGET Protobuf::protoc APPEND PROPERTY + set_property(TARGET protobuf::libprotoc APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - set_target_properties(Protobuf::protoc PROPERTIES + set_target_properties(protobuf::libprotoc PROPERTIES IMPORTED_LOCATION_RELEASE "${Protobuf_PROTOC_LIBRARY_RELEASE}") endif() if(EXISTS "${Protobuf_PROTOC_LIBRARY_DEBUG}") - set_property(TARGET Protobuf::protoc APPEND PROPERTY + set_property(TARGET protobuf::libprotoc APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - set_target_properties(Protobuf::protoc PROPERTIES + set_target_properties(protobuf::libprotoc PROPERTIES IMPORTED_LOCATION_DEBUG "${Protobuf_PROTOC_LIBRARY_DEBUG}") endif() endif() |