summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorThomas Thielemann <thomas@th-thielemann.de>2018-01-14 17:07:08 (GMT)
committerBrad King <brad.king@kitware.com>2018-01-16 15:16:32 (GMT)
commit2489e5af5b66aee1681b74b7b744072c5fb8046f (patch)
treed83c760dacfb847aa2aceffb94f50f728b25de81 /Modules
parent7b78242d602c5ffa1831478ef624bc41642ca1ff (diff)
downloadCMake-2489e5af5b66aee1681b74b7b744072c5fb8046f.zip
CMake-2489e5af5b66aee1681b74b7b744072c5fb8046f.tar.gz
CMake-2489e5af5b66aee1681b74b7b744072c5fb8046f.tar.bz2
FindDoxygen: On macOS search in '/Applications/Utilities' too
`FindDoxygen` already searches in hard-coded `/Applications/Doxygen.app` directories. Search in the `Utilities` subdirectory too in case users choose to put doxygen there.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindDoxygen.cmake5
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)