diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-25 12:59:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-09-25 12:59:43 (GMT) |
| commit | 62d93c9f43a83658a75b8e7afd984a96b631f3d1 (patch) | |
| tree | 3d7359ef11d14d03be9993a55f385278daecbd5d /Modules | |
| parent | 89d155e1bb5031419bc27b6ca99e57782d8785ca (diff) | |
| parent | a960b901de29d4b9c422080d54bcae468a07a8d2 (diff) | |
| download | CMake-62d93c9f43a83658a75b8e7afd984a96b631f3d1.zip CMake-62d93c9f43a83658a75b8e7afd984a96b631f3d1.tar.gz CMake-62d93c9f43a83658a75b8e7afd984a96b631f3d1.tar.bz2 | |
Merge topic 'FindDoxygen-broken-binary'
a960b901de FindDoxygen: Remove redundant debug message when Doxygen fails
59a4aaa237 FindDoxygen: Disable Doxygen if executable returns non-zero result
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8815
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindDoxygen.cmake | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index 76f4759..9903e37 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -463,10 +463,6 @@ function(_Doxygen_version_validator version_match doxy_path) else() _Doxygen_get_version(candidate_version version_result "${doxy_path}") - if(version_result) - message(DEBUG "Unable to determine candidate doxygen version at ${doxy_path}: ${version_result}") - endif() - find_package_check_version("${candidate_version}" valid_doxy_version HANDLE_VERSION_RANGE ) @@ -494,15 +490,18 @@ macro(_Doxygen_find_doxygen) _Doxygen_get_version(DOXYGEN_VERSION _Doxygen_version_result "${DOXYGEN_EXECUTABLE}") if(_Doxygen_version_result) - message(WARNING "Unable to determine doxygen version: ${_Doxygen_version_result}") - endif() - - # Create an imported target for Doxygen - if(NOT TARGET Doxygen::doxygen) - add_executable(Doxygen::doxygen IMPORTED GLOBAL) - set_target_properties(Doxygen::doxygen PROPERTIES - IMPORTED_LOCATION "${DOXYGEN_EXECUTABLE}" - ) + if(NOT Doxygen_FIND_QUIETLY) + message(WARNING "Doxygen executable failed unexpected while determining version (exit status: ${_Doxygen_version_result}). Disabling Doxygen.") + endif() + set(DOXYGEN_EXECUTABLE "${DOXYGEN_EXECUTABLE}-FAILED_EXECUTION-NOTFOUND") + else() + # Create an imported target for Doxygen + if(NOT TARGET Doxygen::doxygen) + add_executable(Doxygen::doxygen IMPORTED GLOBAL) + set_target_properties(Doxygen::doxygen PROPERTIES + IMPORTED_LOCATION "${DOXYGEN_EXECUTABLE}" + ) + endif() endif() endif() endmacro() |