[Cmake-commits] CMake branch, next, updated. v3.0.0-4248-g105bf85

[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  105bf85d309190e34eb31c2beba3cf52dc3a5252 (commit)
       via  0fee3f471204dd9cd47682590bf9f15da456183a (commit)
      from  a42edc6661a8f9a6616a12c83ba9eaff5bfcea65 (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=105bf85d309190e34eb31c2beba3cf52dc3a5252
commit 105bf85d309190e34eb31c2beba3cf52dc3a5252
Merge: a42edc6 0fee3f4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 15 08:59:11 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 15 08:59:11 2014 -0400

    Merge topic 'doc-package-target-import-once' into next
    
    0fee3f47 Revert "Help: Update cmake-packages.7 examples to import targets only once"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fee3f471204dd9cd47682590bf9f15da456183a
commit 0fee3f471204dd9cd47682590bf9f15da456183a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 15 08:58:52 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 15 08:59:11 2014 -0400

    Revert "Help: Update cmake-packages.7 examples to import targets only once"
    
    This reverts commit cfab942e5ff8463f8053564e68179da110280b43.
    Since commit v2.8.11~362^2 (Generate an early-return guard in target
    Export files, 2012-11-30) an external include guard is not needed.

diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst
index 5badd48..c4cca6d 100644
--- a/Help/manual/cmake-packages.7.rst
+++ b/Help/manual/cmake-packages.7.rst
@@ -385,12 +385,9 @@ In this case, the ``ClimbingStatsConfig.cmake`` file could be as simple as:
 
 .. code-block:: cmake
 
-  if(NOT TARGET Upstream::ClimbingStats)
-    include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
-  endif()
+  include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
 
-This allows downstreams to use the ``IMPORTED`` targets, and guards
-against importing the targets more than once.  If any macros
+As this allows downstreams to use the ``IMPORTED`` targets.  If any macros
 should be provided by the ``ClimbingStats`` package, they should
 be in a separate file which is installed to the same location as the
 ``ClimbingStatsConfig.cmake`` file, and included from there.
@@ -457,9 +454,7 @@ dependencies of a package should be found in the ``Config.cmake`` file:
   include(CMakeFindDependencyMacro)
   find_dependency(Stats 2.6.4)
 
-  if(NOT TARGET Upstream::ClimbingStats)
-    include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
-  endif()
+  include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
   include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsMacros.cmake")
 
 The ``find_dependency`` macro also sets ``ClimbingStats_FOUND`` to ``False`` if
@@ -476,9 +471,7 @@ be true. This can be tested with logic in the package configuration file:
   include(CMakeFindDependencyMacro)
   find_dependency(Stats 2.6.4)
 
-  if(NOT TARGET Upstream::ClimbingStats)
-    include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
-  endif()
+  include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
   include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsMacros.cmake")
 
   set(_supported_components Plot Table)

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

Summary of changes:
 Help/manual/cmake-packages.7.rst |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake