[Cmake-commits] CMake branch, next, updated. v3.4.1-1954-g021378e

[Matt McCormick]

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  021378efed47f005d8b20c3d56487d68982919fe (commit)
       via  ae32b5c91d660c30c80c29ab5b548b364e94c89b (commit)
      from  916741017fce97137df31effb795e93a43c4a54d (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=021378efed47f005d8b20c3d56487d68982919fe
commit 021378efed47f005d8b20c3d56487d68982919fe
Merge: 9167410 ae32b5c
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Wed Jan 13 14:15:07 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 13 14:15:07 2016 -0500

    Merge topic 'FindDCMTK-update' into next
    
    ae32b5c9 FindDCMTK: Add compatibility table to documentation.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae32b5c91d660c30c80c29ab5b548b364e94c89b
commit ae32b5c91d660c30c80c29ab5b548b364e94c89b
Author:     Matt McCormick <matt.mccormick at kitware.com>
AuthorDate: Wed Jan 13 14:13:44 2016 -0500
Commit:     Matt McCormick <matt.mccormick at kitware.com>
CommitDate: Wed Jan 13 14:13:44 2016 -0500

    FindDCMTK: Add compatibility table to documentation.
    
    Re: Bug #15909.

diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake
index dd0c9ff..dc663b5 100644
--- a/Modules/FindDCMTK.cmake
+++ b/Modules/FindDCMTK.cmake
@@ -10,11 +10,69 @@
 #  DCMTK_FOUND         - If false, don't try to use DCMTK
 #  DCMTK_DIR           - (optional) Source directory for DCMTK
 #
-# .. 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)`.
+# Compatibility
+# ^^^^^^^^^^^^^
+#
+# This module is able to find a version of DCMTK that does or does not export
+# a *DCMTKConfig.cmake* file. It applies a two step process:
+#
+# * Step 1:  Attempt to find DCMTK version providing a *DCMTKConfig.cmake* file.
+# * Step 2:  If step 1 failed, rely on *FindDCMTK.cmake* to set `DCMTK_*` variables details below.
+#
+#
+# `Recent DCMTK
+# <http://git.dcmtk.org/web?p=dcmtk.git;a=commit;h=662ae187c493c6b9a73dd5e3875372cebd0c11fe>`_
+# 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)`.
+# This requires official DCMTK snapshot *3.6.1_20140617* or newer.
+#
+#
+# Until all clients update to the more recent DCMTK, build systems will need
+# to support different versions of DCMTK.
+#
+# On any given system, the following combinations of DCMTK versions 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.
+#
+#
+# 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.
 #
 #=============================================================================
 # Copyright 2004-2009 Kitware, Inc.

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

Summary of changes:
 Modules/FindDCMTK.cmake |   68 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 63 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake