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

FindDoxygen: Add private prefix to internal variables

Browse Source 
Since commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) we
accidentally leave a non-prefixed internal `result` variable set.
This may interfere with project code.  Add a prefix to avoid this.
This commit is contained in:
Brad King
2017-06-27 08:38:15 -06:00
parent 522c92d752
commit d194bd915b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindDoxygen.cmake
View File

@@ -389,10 +389,10 @@ macro(_Doxygen_find_doxygen)
COMMAND "${DOXYGEN_EXECUTABLE}" --version COMMAND "${DOXYGEN_EXECUTABLE}" --version
OUTPUT_VARIABLE DOXYGEN_VERSION OUTPUT_VARIABLE DOXYGEN_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE result RESULT_VARIABLE _Doxygen_version_result
) )
if(result) if(_Doxygen_version_result)
message(WARNING "Unable to determine doxygen version: ${result}") message(WARNING "Unable to determine doxygen version: ${_Doxygen_version_result}")
endif() endif()
# Create an imported target for Doxygen # Create an imported target for Doxygen
@@ -623,11 +623,11 @@ if(TARGET Doxygen::doxygen)
execute_process( execute_process(
COMMAND "${DOXYGEN_EXECUTABLE}" -s -g "${_Doxygen_tpl}" COMMAND "${DOXYGEN_EXECUTABLE}" -s -g "${_Doxygen_tpl}"
OUTPUT_QUIET OUTPUT_QUIET
RESULT_VARIABLE result RESULT_VARIABLE _Doxygen_tpl_result
) )
if(result) if(_Doxygen_tpl_result)
message(FATAL_ERROR message(FATAL_ERROR
"Unable to generate Doxyfile template: ${result}") "Unable to generate Doxyfile template: ${_Doxygen_tpl_result}")
elseif(NOT EXISTS "${_Doxygen_tpl}") elseif(NOT EXISTS "${_Doxygen_tpl}")
message(FATAL_ERROR message(FATAL_ERROR
"Doxygen has failed to generate a Doxyfile template") "Doxygen has failed to generate a Doxyfile template")