[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3418-gdadd23e

[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  dadd23e8b96b0e28389d290fbd71efbbf8543828 (commit)
       via  f49b6a33f6c4920bf9f18735f66d91c51c2f1581 (commit)
       via  7980eab8d5df63db4077fd1121c6cbe860146ad1 (commit)
      from  a5bfe3aff5f80fd3f34a1e91acfed7a5acdfca2f (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=dadd23e8b96b0e28389d290fbd71efbbf8543828
commit dadd23e8b96b0e28389d290fbd71efbbf8543828
Merge: a5bfe3a f49b6a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 28 16:23:06 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 28 16:23:06 2014 -0400

    Merge topic 'FindDoxygen-windows-dot' into next
    
    f49b6a33 FindDoxygen: Deprecate DOXYGEN_DOT_PATH
    7980eab8 FindDoxygen: Improve search for Graphviz "dot" on Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f49b6a33f6c4920bf9f18735f66d91c51c2f1581
commit f49b6a33f6c4920bf9f18735f66d91c51c2f1581
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 27 16:33:37 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 27 16:40:40 2014 -0400

    FindDoxygen: Deprecate DOXYGEN_DOT_PATH
    
    While at it, do not cache the value since it should always be
    computed directly from DOXYGEN_DOT_EXECUTABLE.
    
    Inspired-by: Lars Bilke <larsbilke83 at googlemail.com>

diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index 844699e..d34941a 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -30,7 +30,16 @@
 #
 #    DOXYGEN_DOT_EXECUTABLE = The path to the dot program used by doxygen.
 #    DOXYGEN_DOT_FOUND      = Was Dot found or not?
-#    DOXYGEN_DOT_PATH       = The path to dot not including the executable
+#
+# For compatibility with older versions of CMake, the now-deprecated
+# variable ``DOXYGEN_DOT_PATH`` is set to the path to the directory
+# containing ``dot`` as reported in ``DOXYGEN_DOT_EXECUTABLE``.
+# The path may have forward slashes even on Windows and is not
+# suitable for direct substitution into a ``Doxyfile.in`` template.
+# If you need this value, use :command:`get_filename_component`
+# to compute it from ``DOXYGEN_DOT_EXECUTABLE`` directly, and
+# perhaps the :command:`file(TO_NATIVE_PATH)` command to prepare
+# the path for a Doxygen configuration file.
 
 #=============================================================================
 # Copyright 2001-2009 Kitware, Inc.
@@ -125,7 +134,7 @@ if(NOT DOXYGEN_SKIP_DOT)
   if(DOXYGEN_DOT_EXECUTABLE)
     set(DOXYGEN_DOT_FOUND TRUE)
     # The Doxyfile wants the path to Dot, not the entire path and executable
-    get_filename_component(DOXYGEN_DOT_PATH "${DOXYGEN_DOT_EXECUTABLE}" PATH CACHE)
+    get_filename_component(DOXYGEN_DOT_PATH "${DOXYGEN_DOT_EXECUTABLE}" PATH)
   endif()
 
 endif()
@@ -159,5 +168,4 @@ set (DOT ${DOXYGEN_DOT_EXECUTABLE} )
 mark_as_advanced(
   DOXYGEN_EXECUTABLE
   DOXYGEN_DOT_EXECUTABLE
-  DOXYGEN_DOT_PATH
   )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7980eab8d5df63db4077fd1121c6cbe860146ad1
commit 7980eab8d5df63db4077fd1121c6cbe860146ad1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 27 16:34:18 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 27 16:34:18 2014 -0400

    FindDoxygen: Improve search for Graphviz "dot" on Windows
    
    As of Graphviz 2.31, their installer provides no PATH or registry
    modifications.  Glob possible install paths instead.
    
    Inspired-by: Lars Bilke <larsbilke83 at googlemail.com>

diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index a456d9c..844699e 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -101,12 +101,18 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Doxygen REQUIRED_VARS DOXYGEN_EXECUTABLE VERSI
 # Find Dot...
 #
 
+set(_x86 "(x86)")
+file(GLOB _Doxygen_GRAPHVIZ_BIN_DIRS
+  "$ENV{ProgramFiles}/Graphviz*/bin"
+  "$ENV{ProgramFiles${_x86}}/Graphviz*/bin"
+  )
+unset(_x86)
+
 if(NOT DOXYGEN_SKIP_DOT)
   find_program(DOXYGEN_DOT_EXECUTABLE
     NAMES dot
     PATHS
-      "$ENV{ProgramFiles}/Graphviz 2.21/bin"
-      "C:/Program Files/Graphviz 2.21/bin"
+      ${_Doxygen_GRAPHVIZ_BIN_DIRS}
       "$ENV{ProgramFiles}/ATT/Graphviz/bin"
       "C:/Program Files/ATT/Graphviz/bin"
       [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin

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

Summary of changes:
 Modules/FindDoxygen.cmake |   24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake