summaryrefslogtreecommitdiffstats
path: root/Modules/FindDoxygen.cmake
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-10-24 14:03:58 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-10-24 14:03:58 (GMT)
commit112dadc0e85e42a708cee2ddeb226d0f667006ec (patch)
treea9af4d656708bad3fd7d10b38e0648c9aa9b0769 /Modules/FindDoxygen.cmake
parentae5df56bbca7ecbd82644ac7bc0cb599ce160e97 (diff)
downloadCMake-112dadc0e85e42a708cee2ddeb226d0f667006ec.zip
CMake-112dadc0e85e42a708cee2ddeb226d0f667006ec.tar.gz
CMake-112dadc0e85e42a708cee2ddeb226d0f667006ec.tar.bz2
ENH: fix more doxygen issues
Diffstat (limited to 'Modules/FindDoxygen.cmake')
-rw-r--r--Modules/FindDoxygen.cmake19
1 files changed, 5 insertions, 14 deletions
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index 23ac5a3..5d4554b 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -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 @@ FIND_PROGRAM(DOXYGEN_DOT_EXECUTABLE
/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})