kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Help: Update cmake-packages.7 examples to import targets only once" 

This reverts commit cfab942e5f.
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.
This commit is contained in:
Brad King 2014-07-15 08:58:52 -04:00
parent cfab942e5f
commit 0fee3f4712
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Help/manual/cmake-packages.7.rst
View File

@ -385,12 +385,9 @@ In this case, the ``ClimbingStatsConfig.cmake`` file could be as simple as:
.. code-block:: cmake .. code-block:: cmake
if(NOT TARGET Upstream::ClimbingStats)
include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
endif()
This allows downstreams to use the ``IMPORTED`` targets, and guards As this allows downstreams to use the ``IMPORTED`` targets. If any macros
against importing the targets more than once. If any macros
should be provided by the ``ClimbingStats`` package, they should should be provided by the ``ClimbingStats`` package, they should
be in a separate file which is installed to the same location as the be in a separate file which is installed to the same location as the
``ClimbingStatsConfig.cmake`` file, and included from there. ``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) include(CMakeFindDependencyMacro)
find_dependency(Stats 2.6.4) find_dependency(Stats 2.6.4)
if(NOT TARGET Upstream::ClimbingStats)
include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
endif()
include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsMacros.cmake") include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsMacros.cmake")
The ``find_dependency`` macro also sets ``ClimbingStats_FOUND`` to ``False`` if 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) include(CMakeFindDependencyMacro)
find_dependency(Stats 2.6.4) find_dependency(Stats 2.6.4)
if(NOT TARGET Upstream::ClimbingStats)
include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
endif()
include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsMacros.cmake") include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsMacros.cmake")
set(_supported_components Plot Table) set(_supported_components Plot Table)