diff options
| -rw-r--r-- | Modules/FindDoxygen.cmake | 8 | ||||
| -rw-r--r-- | Utilities/Doxygen/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index 3b8fc9fc5c..7627950bfd 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -4,20 +4,16 @@ FIND_PROGRAM(DOXYGEN doxygen + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\doxygen_is1;Inno Setup: App Path]/bin" ) FIND_PROGRAM(DOT dot "C:/Program Files/ATT/Graphviz/bin" + [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin ) -# HKEY_CURRENT_USER\Software\AT&T\Graphviz - -# Since most of the time dot is called by Doxygen, the path to dot is -# useful too -GET_FILENAME_COMPONENT(DOT_PATH ${DOT} PATH CACHE) MARK_AS_ADVANCED( DOT - DOT_PATH DOXYGEN ) diff --git a/Utilities/Doxygen/CMakeLists.txt b/Utilities/Doxygen/CMakeLists.txt index a185c2a32f..f8c5267e30 100644 --- a/Utilities/Doxygen/CMakeLists.txt +++ b/Utilities/Doxygen/CMakeLists.txt @@ -10,6 +10,10 @@ IF (BUILD_DOCUMENTATION) # # Configure the script and the doxyfile, then add target # + IF(NOT DOT_PATH) + GET_FILENAME_COMPONENT(DOT_PATH ${DOT} PATH) + ENDIF(NOT DOT_PATH) + CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in ${CMAKE_BINARY_DIR}/Utilities/Doxygen/doxyfile) |