summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorSebastien Barre <sebastien.barre@kitware.com>2004-06-08 21:26:48 (GMT)
committerSebastien Barre <sebastien.barre@kitware.com>2004-06-08 21:26:48 (GMT)
commit6037cc8b3b7c1dc241a5832b21b8bf029bcf7351 (patch)
tree9e4c53de03a2c9318d9200844c6577372b854519 /Modules
parent32ccf38c58b1eac0578f8689e0dd7760a754d483 (diff)
downloadCMake-6037cc8b3b7c1dc241a5832b21b8bf029bcf7351.zip
CMake-6037cc8b3b7c1dc241a5832b21b8bf029bcf7351.tar.gz
CMake-6037cc8b3b7c1dc241a5832b21b8bf029bcf7351.tar.bz2
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)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindDoxygen.cmake8
1 files changed, 2 insertions, 6 deletions
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index 3b8fc9f..7627950 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
)