[Cmake-commits] CMake branch, master, updated. v3.8.1-1269-g346f1c0
Kitware Robot
kwrobot at kitware.com
Tue May 23 13:35:07 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 346f1c0cf3dc543414692a56cb1b7bb4caf5417a (commit)
via 590c92d1250f0d89fb45d287984b84bbbfebe21a (commit)
via 4131d1b58ee1b868c139685f9f2a5cd5ebc4f84c (commit)
via a5ccddf05758daa0652ed6674581a871fc683a39 (commit)
from c3c77d662a608ced362c95f1a20c882ca7915706 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=346f1c0cf3dc543414692a56cb1b7bb4caf5417a
commit 346f1c0cf3dc543414692a56cb1b7bb4caf5417a
Merge: 590c92d 4131d1b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 23 17:30:12 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 23 13:30:23 2017 -0400
Merge topic 'FindImageMagick-support-v7'
4131d1b5 FindImageMagick: Update to work with v7
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !874
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=590c92d1250f0d89fb45d287984b84bbbfebe21a
commit 590c92d1250f0d89fb45d287984b84bbbfebe21a
Merge: c3c77d6 a5ccddf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue May 23 17:29:38 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue May 23 13:29:59 2017 -0400
Merge topic 'FindProtobuf-targets'
a5ccddf0 FindProtobuf: Rename imported targets to match upstream names
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !876
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4131d1b58ee1b868c139685f9f2a5cd5ebc4f84c
commit 4131d1b58ee1b868c139685f9f2a5cd5ebc4f84c
Author: Robert Dailey <rcdailey at gmail.com>
AuthorDate: Fri May 19 17:05:45 2017 -0500
Commit: Robert Dailey <rcdailey at gmail.com>
CommitDate: Mon May 22 12:54:31 2017 -0500
FindImageMagick: Update to work with v7
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()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5ccddf05758daa0652ed6674581a871fc683a39
commit a5ccddf05758daa0652ed6674581a871fc683a39
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 22 10:48:41 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 22 10:51:55 2017 -0400
FindProtobuf: Rename imported targets to match upstream names
Rename our recently added imported targets to match those provided by
the upstream's CMake-based build. That way a project using
`find_package(Protobuf)` can get the same target names no matter how
protobuf is found.
Suggested-by: Konstantin Podsvirov <konstantin at podsvirov.pro>
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()
diff --git a/Tests/FindProtobuf/Test/CMakeLists.txt b/Tests/FindProtobuf/Test/CMakeLists.txt
index d7a5081..8b6e38a 100644
--- a/Tests/FindProtobuf/Test/CMakeLists.txt
+++ b/Tests/FindProtobuf/Test/CMakeLists.txt
@@ -5,7 +5,7 @@ include(CTest)
find_package(Protobuf REQUIRED)
add_executable(test_tgt main.cxx)
-target_link_libraries(test_tgt Protobuf::protobuf)
+target_link_libraries(test_tgt protobuf::libprotobuf)
add_test(NAME test_tgt COMMAND test_tgt)
add_executable(test_var main.cxx)
@@ -14,7 +14,7 @@ target_link_libraries(test_var PRIVATE ${Protobuf_LIBRARIES})
add_test(NAME test_var COMMAND test_var)
add_executable(test_tgt_lite main.cxx)
-target_link_libraries(test_tgt_lite Protobuf::protobuf-lite)
+target_link_libraries(test_tgt_lite protobuf::libprotobuf-lite)
add_test(NAME test_tgt_lite COMMAND test_tgt_lite)
add_executable(test_var_lite main.cxx)
@@ -23,7 +23,7 @@ target_link_libraries(test_var_lite PRIVATE ${Protobuf_LITE_LIBRARIES})
add_test(NAME test_var_lite COMMAND test_var_lite)
add_executable(test_tgt_protoc main-protoc.cxx)
-target_link_libraries(test_tgt_protoc Protobuf::protoc)
+target_link_libraries(test_tgt_protoc protobuf::libprotoc)
add_test(NAME test_tgt_protoc COMMAND test_tgt_protoc)
add_executable(test_var_protoc main-protoc.cxx)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindImageMagick.cmake | 23 +++++++++-----
Modules/FindProtobuf.cmake | 54 ++++++++++++++++----------------
Tests/FindProtobuf/Test/CMakeLists.txt | 6 ++--
3 files changed, 46 insertions(+), 37 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list