diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-27 14:38:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-27 14:45:45 (GMT) |
| commit | d194bd915be3d99fda2d9e504655a78ee983f984 (patch) | |
| tree | 3353a759a494efe58b040933f395f350dd080547 | |
| parent | 522c92d752753089f4bd50552955883a6f005570 (diff) | |
| download | CMake-d194bd915be3d99fda2d9e504655a78ee983f984.zip CMake-d194bd915be3d99fda2d9e504655a78ee983f984.tar.gz CMake-d194bd915be3d99fda2d9e504655a78ee983f984.tar.bz2 | |
FindDoxygen: Add private prefix to internal variables
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.
| -rw-r--r-- | Modules/FindDoxygen.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index 0d9e161..26d44b9 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -389,10 +389,10 @@ macro(_Doxygen_find_doxygen) COMMAND "${DOXYGEN_EXECUTABLE}" --version OUTPUT_VARIABLE DOXYGEN_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE - RESULT_VARIABLE result + RESULT_VARIABLE _Doxygen_version_result ) - if(result) - message(WARNING "Unable to determine doxygen version: ${result}") + if(_Doxygen_version_result) + message(WARNING "Unable to determine doxygen version: ${_Doxygen_version_result}") endif() # Create an imported target for Doxygen @@ -623,11 +623,11 @@ if(TARGET Doxygen::doxygen) execute_process( COMMAND "${DOXYGEN_EXECUTABLE}" -s -g "${_Doxygen_tpl}" OUTPUT_QUIET - RESULT_VARIABLE result + RESULT_VARIABLE _Doxygen_tpl_result ) - if(result) + if(_Doxygen_tpl_result) message(FATAL_ERROR - "Unable to generate Doxyfile template: ${result}") + "Unable to generate Doxyfile template: ${_Doxygen_tpl_result}") elseif(NOT EXISTS "${_Doxygen_tpl}") message(FATAL_ERROR "Doxygen has failed to generate a Doxyfile template") |