[Cmake-commits] CMake branch, next, updated. v3.4.1-1952-g9167410
Matt McCormick
matt.mccormick at kitware.com
Wed Jan 13 10:53:25 EST 2016
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 916741017fce97137df31effb795e93a43c4a54d (commit)
via ed54acf383ef7c46a2746c4423f395d399f0e525 (commit)
from 1e6e2d6c5bc43ad9ff65f2e4e554fb15c70437b4 (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=916741017fce97137df31effb795e93a43c4a54d
commit 916741017fce97137df31effb795e93a43c4a54d
Merge: 1e6e2d6 ed54acf
Author: Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Wed Jan 13 10:53:25 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 13 10:53:25 2016 -0500
Merge topic 'FindDCMTK-update' into next
ed54acf3 FindDCMTK: Simplify documentation.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed54acf383ef7c46a2746c4423f395d399f0e525
commit ed54acf383ef7c46a2746c4423f395d399f0e525
Author: Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Wed Jan 13 10:53:03 2016 -0500
Commit: Matt McCormick <matt.mccormick at kitware.com>
CommitDate: Wed Jan 13 10:53:03 2016 -0500
FindDCMTK: Simplify documentation.
diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake
index 1238616..dd0c9ff 100644
--- a/Modules/FindDCMTK.cmake
+++ b/Modules/FindDCMTK.cmake
@@ -10,92 +10,11 @@
# DCMTK_FOUND - If false, don't try to use DCMTK
# DCMTK_DIR - (optional) Source directory for DCMTK
#
-# `DCMTK_DIR` can be used to make it simpler to find the various include
-# directories and compiled libraries if you've just compiled it in the
-# source tree. Just set it to the root of the tree where you extracted
-# the source (default to `/usr`)
-#
-#
-# This file is able to find version of DCMTK that does or does not export
-# a *DCMTKConfig.cmake* file.
-#
-# .. important::
-# A set of patches has been contributed to DCMTK
-# maintainers and merged upstream. As soon as:
-#
-# 1) it has been integrated upstream so that it is available in
-# an official release (for example X.Y.Z),
-# 2) code bases have been updated to build against X.Y.Z
-#
-# This file could be removed.
-#
-# The set of patches is listed here: https://github.com/commontk/DCMTK/compare/79030ba...f461865
-#
-#
-# Waiting for this to happen, build systems will have to be able
-# to support different versions of DCMTK.
-#
-# On any given system, the following combination of DCMTK version could be
-# considered:
-#
-# +--------+---------------------+-----------------------+-------------------+
-# | | SYSTEM DCMTK | LOCAL DCMTK | Supported ? |
-# +--------+---------------------+-----------------------+-------------------+
-# | Case A | NA | [ ] DCMTKConfig | YES |
-# +--------+---------------------+-----------------------+-------------------+
-# | Case B | NA | [X] DCMTKConfig | YES |
-# +--------+---------------------+-----------------------+-------------------+
-# | Case C | [ ] DCMTKConfig | NA | YES |
-# +--------+---------------------+-----------------------+-------------------+
-# | Case D | [X] DCMTKConfig | NA | YES |
-# +--------+---------------------+-----------------------+-------------------+
-# | Case E | [ ] DCMTKConfig | [ ] DCMTKConfig | YES (*) |
-# +--------+---------------------+-----------------------+-------------------+
-# | Case F | [X] DCMTKConfig | [ ] DCMTKConfig | NO |
-# +--------+---------------------+-----------------------+-------------------+
-# | Case G | [ ] DCMTKConfig | [X] DCMTKConfig | YES |
-# +--------+---------------------+-----------------------+-------------------+
-# | Case H | [X] DCMTKConfig | [X] DCMTKConfig | YES |
-# +--------+---------------------+-----------------------+-------------------+
-#
-# (*) See Troubleshooting section.
-#
-# Legend:
-#
-# NA ...............: Means that no System or Local DCMTK is available
-#
-# [ ] DCMTKConfig ..: Means that the version of DCMTK does NOT export a DCMTKConfig.cmake file.
-#
-# [X] DCMTKConfig ..: Means that the version of DCMTK exports a DCMTKConfig.cmake file.
-#
-#
-# It is a two step process:
-#
-# * Step 1: Attempt to find DCMTK version providing a DCMTKConfig.cmake file. This is done with the help of `''`
-# * Step 2: If step 1 failed, rely on FindDCMTK.cmake to set DCMTK_* variables details below.
-#
-# Troubleshooting
-# ^^^^^^^^^^^^^^^
-#
-# What to do if my project finds a different version of DCMTK?
-#
-# Remove DCMTK entry from the CMake registry per :command:`find_package`
-# documentation.
-#
-# Details
-# ^^^^^^^
-#
-# At some point, the DCMTK build tree was exported [1][2][3]. Indeed, before the set of
-# patches discussed above has been contributed to upstream DCMTK, an initial implementation of
-# a DCMTK build system exporting its build tree has been implemented and has been tested by some
-# folks. This had the effect of populating the CMake registry.
-#
-# Since Step1 does not exclude the CMake registry, when dealing with case E, the incorrect version of
-# DCMTK could be found.
-#
-# - [1] http://slicer-devel.65872.n3.nabble.com/Packaging-seems-to-work-again-tp4028121p4028134.html
-# - [2] https://www.assembla.com/spaces/slicerrt/tickets/244-dcmtk_dir-vs--dcmtkconfig-cmake?comment=267984263#comment:267984263
-# - [3] http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:export
+# .. note::
+# Recent DCMTK provides a *DCMTKConfig.cmake* :manual:`package configuration file
+# <cmake-packages(7)>`. To exclusively use the package configuration file
+# (recommended when possible), pass the `NO_MODULE` option to
+# :command:`find_package`. For example, `find_package(DCMTK NO_MODULE)`.
#
#=============================================================================
# Copyright 2004-2009 Kitware, Inc.
-----------------------------------------------------------------------
Summary of changes:
Modules/FindDCMTK.cmake | 91 +++--------------------------------------------
1 file changed, 5 insertions(+), 86 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list