kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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)
This commit is contained in:
Sebastien Barre 2004-06-08 17:26:48 -04:00
parent 32ccf38c58
commit 6037cc8b3b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindDoxygen.cmake
View File

@ -4,20 +4,16 @@
FIND_PROGRAM(DOXYGEN FIND_PROGRAM(DOXYGEN
doxygen doxygen
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\doxygen_is1;Inno Setup: App Path]/bin"
) )
FIND_PROGRAM(DOT FIND_PROGRAM(DOT
dot dot
"C:/Program Files/ATT/Graphviz/bin" "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( MARK_AS_ADVANCED(
DOT DOT
DOT_PATH
DOXYGEN DOXYGEN
) )

4
Utilities/Doxygen/CMakeLists.txt
View File

@ -10,6 +10,10 @@ IF (BUILD_DOCUMENTATION)
# #
# Configure the script and the doxyfile, then add target # 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( CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in ${CMAKE_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in
${CMAKE_BINARY_DIR}/Utilities/Doxygen/doxyfile) ${CMAKE_BINARY_DIR}/Utilities/Doxygen/doxyfile)