diff options
| author | Craig Scott <craig.scott@crascit.com> | 2018-01-17 20:08:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-17 20:08:22 (GMT) |
| commit | b1fd31382654564e01eb0224bd18df81f61cb82f (patch) | |
| tree | 2307cac3ff87af5eb37bc38910a6d59ffd8a0683 | |
| parent | 657898ecad4fecff001964b3f0e27e77b5f9ffcd (diff) | |
| parent | 2489e5af5b66aee1681b74b7b744072c5fb8046f (diff) | |
| download | CMake-b1fd31382654564e01eb0224bd18df81f61cb82f.zip CMake-b1fd31382654564e01eb0224bd18df81f61cb82f.tar.gz CMake-b1fd31382654564e01eb0224bd18df81f61cb82f.tar.bz2 | |
Merge topic 'FindDoxygen-macos-utils'
2489e5af FindDoxygen: On macOS search in '/Applications/Utilities' too
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1661
| -rw-r--r-- | Modules/FindDoxygen.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index 8aea4e0..599d799 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -411,6 +411,8 @@ macro(_Doxygen_find_doxygen) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\doxygen_is1;Inno Setup: App Path]/bin" /Applications/Doxygen.app/Contents/Resources /Applications/Doxygen.app/Contents/MacOS + /Applications/Utilities/Doxygen.app/Contents/Resources + /Applications/Utilities/Doxygen.app/Contents/MacOS DOC "Doxygen documentation generation tool (http://www.doxygen.org)" ) mark_as_advanced(DOXYGEN_EXECUTABLE) @@ -492,8 +494,11 @@ macro(_Doxygen_find_dot) "C:/Program Files/ATT/Graphviz/bin" [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin /Applications/Graphviz.app/Contents/MacOS + /Applications/Utilities/Graphviz.app/Contents/MacOS /Applications/Doxygen.app/Contents/Resources /Applications/Doxygen.app/Contents/MacOS + /Applications/Utilities/Doxygen.app/Contents/Resources + /Applications/Utilities/Doxygen.app/Contents/MacOS DOC "Dot tool for use with Doxygen" ) mark_as_advanced(DOXYGEN_DOT_EXECUTABLE) |