An update will be applied January 25th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit 6037cc8b authored by Sebastien Barre's avatar Sebastien Barre
Browse files

a) new version of tools like Doxygen and Graphviz now set install path info in...

a) new version of tools like Doxygen and Graphviz now set install path info in win32 registery. use it.
b) remove DOT_PATH, it was polluting the cache (can be computed from DOT, update CMakeLists.txt accordingly if DOT_PATH is not defined)
parent 32ccf38c
......@@ -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
)
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment