mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 04:40:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindDoxygen-broken-binary'

Browse Source 
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
This commit is contained in:
Brad King
2023-09-25 12:59:43 +00:00
committed by Kitware Robot
parent 89d155e1bb a960b901de
commit 62d93c9f43
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindDoxygen.cmake
+12 -13
View File
@@ -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()