[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-940-gfbfb150

[Brad King]

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, next has been updated
       via  fbfb15030c1e5fc1bb472b61b8b0e73c0265da0a (commit)
       via  889b22e2cab163be390d7856ef2939b9e2143ad3 (commit)
       via  cd4d2e9c79356be9ec6a0fe2b3ec3731254bb9ef (commit)
       via  748f1eaee3b834008837d0b43d23ee8b052e9403 (commit)
      from  0aa3facb6d91bf5a4d39568444554bbc232880fa (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbfb15030c1e5fc1bb472b61b8b0e73c0265da0a
commit fbfb15030c1e5fc1bb472b61b8b0e73c0265da0a
Merge: 0aa3fac 889b22e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 9 09:48:34 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 9 09:48:34 2015 -0400

    Merge topic 'FindIce-imported-targets' into next
    
    889b22e2 Help: Add notes for topic 'FindIce-imported-targets'
    cd4d2e9c FindIce: document imported targets
    748f1eae FindIce: create imported targets for components


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=889b22e2cab163be390d7856ef2939b9e2143ad3
commit 889b22e2cab163be390d7856ef2939b9e2143ad3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 9 09:48:15 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 9 09:48:15 2015 -0400

    Help: Add notes for topic 'FindIce-imported-targets'

diff --git a/Help/release/dev/FindIce-imported-targets.rst b/Help/release/dev/FindIce-imported-targets.rst
new file mode 100644
index 0000000..7e1b2f4
--- /dev/null
+++ b/Help/release/dev/FindIce-imported-targets.rst
@@ -0,0 +1,4 @@
+FindIce-imported-targets
+------------------------
+
+* The :module:`FindIce` module now provides imported targets.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd4d2e9c79356be9ec6a0fe2b3ec3731254bb9ef
commit cd4d2e9c79356be9ec6a0fe2b3ec3731254bb9ef
Author:     Roger Leigh <rleigh at dundee.ac.uk>
AuthorDate: Thu Jul 9 10:55:09 2015 +0100
Commit:     Roger Leigh <rleigh at dundee.ac.uk>
CommitDate: Thu Jul 9 11:33:56 2015 +0100

    FindIce: document imported targets

diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index 6a06e2f..3fa6cab 100644
--- a/Modules/FindIce.cmake
+++ b/Modules/FindIce.cmake
@@ -20,6 +20,13 @@
 #   Ice_SLICE_DIRS - the directories containing the Ice slice interface
 #                    definitions
 #
+# Imported targets::
+#
+#   Ice::<C>
+#
+# Where ``<C>`` is the name of an Ice component, for example
+# ``Ice::Glacier2``.
+#
 # Ice slice programs are reported in::
 #
 #   Ice_SLICE2CPP_EXECUTABLE - path to slice2cpp executable

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=748f1eaee3b834008837d0b43d23ee8b052e9403
commit 748f1eaee3b834008837d0b43d23ee8b052e9403
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Jul 8 10:49:22 2015 +0200
Commit:     Roger Leigh <rleigh at dundee.ac.uk>
CommitDate: Thu Jul 9 11:32:36 2015 +0100

    FindIce: create imported targets for components

diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index c88c1b8..6a06e2f 100644
--- a/Modules/FindIce.cmake
+++ b/Modules/FindIce.cmake
@@ -433,13 +433,21 @@ if(Ice_FOUND)
     set(_Ice_component_cache "Ice_${_Ice_component_upcase}_LIBRARY")
     set(_Ice_component_lib "Ice_${_Ice_component_upcase}_LIBRARIES")
     set(_Ice_component_found "${_Ice_component_upcase}_FOUND")
+    set(_Ice_imported_target "Ice::${_Ice_component}")
     if(${_Ice_component_found})
       set("${_Ice_component_lib}" "${${_Ice_component_cache}}")
+      if(NOT TARGET ${_Ice_imported_target})
+        add_library(${_Ice_imported_target} UNKNOWN IMPORTED)
+        set_target_properties(${_Ice_imported_target} PROPERTIES
+          IMPORTED_LOCATION "${${_Ice_component_cache}}"
+          INTERFACE_INCLUDE_DIRECTORIES "${Ice_INCLUDE_DIR}")
+      endif()
     endif()
     unset(_Ice_component_upcase)
     unset(_Ice_component_cache)
     unset(_Ice_component_lib)
     unset(_Ice_component_found)
+    unset(_Ice_imported_target)
   endforeach()
 endif()
 

-----------------------------------------------------------------------

Summary of changes:
 Help/release/dev/FindIce-imported-targets.rst |    4 ++++
 Modules/FindIce.cmake                         |   15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 Help/release/dev/FindIce-imported-targets.rst


hooks/post-receive
-- 
CMake