[Cmake-commits] CMake branch, next, updated. v2.8.5-1463-g931f9c1

[David Cole]

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  931f9c1e65fc52c888c928c2a98a032690fed2a2 (commit)
       via  0167ceaf98c78f40532fc187b35440d033ac837e (commit)
       via  4675f5d20423cd3331570a75794468bb3af1edaf (commit)
      from  1d23a3b8b0975f78635387fe06445d6defc7f47e (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=931f9c1e65fc52c888c928c2a98a032690fed2a2
commit 931f9c1e65fc52c888c928c2a98a032690fed2a2
Merge: 1d23a3b 0167cea
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Aug 9 15:18:01 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 9 15:18:01 2011 -0400

    Merge topic 'fix-12323-more-paths-in-finddcmtk' into next
    
    0167cea Add more find_path locations for DCMTK header files (#12323)
    4675f5d KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0167ceaf98c78f40532fc187b35440d033ac837e
commit 0167ceaf98c78f40532fc187b35440d033ac837e
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Aug 9 15:13:46 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Aug 9 15:15:53 2011 -0400

    Add more find_path locations for DCMTK header files (#12323)

diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake
index 0ac22f8..361d09e 100644
--- a/Modules/FindDCMTK.cmake
+++ b/Modules/FindDCMTK.cmake
@@ -108,8 +108,10 @@ foreach(dir
     PATHS
     ${DCMTK_DIR}/${dir}/include
     ${DCMTK_DIR}/${dir}
-    ${DCMTK_DIR}/include/${dir})
-
+    ${DCMTK_DIR}/include/${dir}
+    ${DCMTK_DIR}/include/dcmtk/${dir}
+    ${DCMTK_DIR}/${dir}/include/dcmtk/${dir}
+    )
   mark_as_advanced(DCMTK_${dir}_INCLUDE_DIR)
 
   if(DCMTK_${dir}_INCLUDE_DIR)

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

Summary of changes:
 Modules/FindDCMTK.cmake           |    6 ++++--
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake