diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-27 20:34:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-27 20:34:18 (GMT) |
| commit | 7980eab8d5df63db4077fd1121c6cbe860146ad1 (patch) | |
| tree | 1e726ad4ccc8dc88c3fabb20666668f356140408 /Modules/FindDoxygen.cmake | |
| parent | 41a0fde1c9d179108b2db8b111b6a0ea1c6d501e (diff) | |
| download | CMake-7980eab8d5df63db4077fd1121c6cbe860146ad1.zip CMake-7980eab8d5df63db4077fd1121c6cbe860146ad1.tar.gz CMake-7980eab8d5df63db4077fd1121c6cbe860146ad1.tar.bz2 | |
FindDoxygen: Improve search for Graphviz "dot" on Windows
As of Graphviz 2.31, their installer provides no PATH or registry
modifications. Glob possible install paths instead.
Inspired-by: Lars Bilke <larsbilke83@googlemail.com>
Diffstat (limited to 'Modules/FindDoxygen.cmake')
| -rw-r--r-- | Modules/FindDoxygen.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index a456d9c..844699e 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -101,12 +101,18 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Doxygen REQUIRED_VARS DOXYGEN_EXECUTABLE VERSI # Find Dot... # +set(_x86 "(x86)") +file(GLOB _Doxygen_GRAPHVIZ_BIN_DIRS + "$ENV{ProgramFiles}/Graphviz*/bin" + "$ENV{ProgramFiles${_x86}}/Graphviz*/bin" + ) +unset(_x86) + if(NOT DOXYGEN_SKIP_DOT) find_program(DOXYGEN_DOT_EXECUTABLE NAMES dot PATHS - "$ENV{ProgramFiles}/Graphviz 2.21/bin" - "C:/Program Files/Graphviz 2.21/bin" + ${_Doxygen_GRAPHVIZ_BIN_DIRS} "$ENV{ProgramFiles}/ATT/Graphviz/bin" "C:/Program Files/ATT/Graphviz/bin" [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin |