[cmake-commits] hoffman committed FindDoxygen.cmake 1.11 1.12

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv14692

Modified Files:
	FindDoxygen.cmake 
Log Message:
ENH: fix more doxygen issues


Index: FindDoxygen.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindDoxygen.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- FindDoxygen.cmake	23 Oct 2006 18:51:56 -0000	1.11
+++ FindDoxygen.cmake	24 Oct 2006 14:03:58 -0000	1.12
@@ -1,4 +1,4 @@
-# - This module looks for Doxygen and the path to Graphiz's dot
+# - This module looks for Doxygen and the path to Graphviz's dot
 # Doxygen is a documentation generation tool see http://www.doxygen.org
 # With the OS X GUI version, it likes to be installed to /Applications and
 # it contains the doxygen executable in the bundle. In the versions I've 
@@ -6,6 +6,7 @@
 # located in MacOS. This code sets the following variables:
 #  DOXYGEN_EXECUTABLE     = The path to the doxygen command.
 #  DOXYGEN_DOT_EXECUTABLE = The path to the dot program used by doxygen.
+#  DOXYGEN_DOT_PATH       = The path to dot not including the executable
 #  DOXYGEN = same as DOXYGEN_EXECUTABLE for backwards compatibility
 #  DOT = same as DOXYGEN_DOT_EXECUTABLE for backwards compatibility
 
@@ -64,30 +65,20 @@
   /Applications/Graphviz.app/Contents/MacOS
   /Applications/Doxygen.app/Contents/Resources
   /Applications/Doxygen.app/Contents/MacOS
-  DOC "Graphiz Dot tool for using Doxygen"
+  DOC "Graphviz Dot tool for using Doxygen"
 )
 
 IF (NOT DOXYGEN_FIND_QUIETLY)
   IF (DOXYGEN_DOT_EXECUTABLE)
     MESSAGE(STATUS "Looking for dot tool... - found ${DOXYGEN_DOT_EXECUTABLE}")
+    # The Doxyfile wants the path to Dot, not the entire path and executable
+    GET_FILENAME_COMPONENT(DOXYGEN_DOT_PATH "${DOXYGEN_DOT_EXECUTABLE}" PATH CACHE)
   ELSE (DOXYGEN_DOT_EXECUTABLE)
     MESSAGE(STATUS "Looking for dot tool... - NOT found")
   ENDIF (DOXYGEN_DOT_EXECUTABLE)
 ENDIF (NOT DOXYGEN_FIND_QUIETLY)
 
 
-# The Doxyfile wants the path to Dot, not the entire path and executable
-# so for convenience, I'll add another search for DOXYGEN_DOT_PATH.
-FIND_PATH(DOXYGEN_DOT_PATH
-  dot
-  "C:/Program Files/ATT/Graphviz/bin"
-  [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
-  /Applications/Graphviz.app/Contents/MacOS
-  /Applications/Doxygen.app/Contents/Resources
-  /Applications/Doxygen.app/Contents/MacOS
-  DOC "Path to the Graphviz Dot tool"
-)
-
 # Restore the old app-bundle setting setting
 SET(CMAKE_FIND_APPBUNDLE ${TEMP_DOXYGEN_SAVE_CMAKE_FIND_APPBUNDLE})