diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-27 13:50:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-27 13:50:07 (GMT) |
| commit | e3ec57483464b4c509e9f8b24e4ac8c6990f823b (patch) | |
| tree | 6e17348f3be4c569967c138d0ad668073b90f986 | |
| parent | bae71966fb35649dda8fc4f962316e3dbea8f787 (diff) | |
| parent | 85a035bf00d53d33251f30f850be7be169cbcde8 (diff) | |
| download | CMake-e3ec57483464b4c509e9f8b24e4ac8c6990f823b.zip CMake-e3ec57483464b4c509e9f8b24e4ac8c6990f823b.tar.gz CMake-e3ec57483464b4c509e9f8b24e4ac8c6990f823b.tar.bz2 | |
Merge topic 'FindDoxygen-win-glob'
85a035bf00 FindDoxygen: Avoid Windows-specific GLOB on other platforms
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2660
| -rw-r--r-- | Modules/FindDoxygen.cmake | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index 2ed9449..fdd3a92 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -485,12 +485,18 @@ endmacro() # Find Graphviz Dot... # macro(_Doxygen_find_dot) - set(_x86 "(x86)") - file( - GLOB _Doxygen_GRAPHVIZ_BIN_DIRS - "$ENV{ProgramFiles}/Graphviz*/bin" - "$ENV{ProgramFiles${_x86}}/Graphviz*/bin" - ) + if(WIN32) + set(_x86 "(x86)") + file( + GLOB _Doxygen_GRAPHVIZ_BIN_DIRS + "$ENV{ProgramFiles}/Graphviz*/bin" + "$ENV{ProgramFiles${_x86}}/Graphviz*/bin" + ) + unset(_x86) + else() + set(_Doxygen_GRAPHVIZ_BIN_DIRS "") + endif() + find_program( DOXYGEN_DOT_EXECUTABLE NAMES dot @@ -529,7 +535,6 @@ macro(_Doxygen_find_dot) endif() unset(_Doxygen_GRAPHVIZ_BIN_DIRS) - unset(_x86) endmacro() # |