[Cmake-commits] CMake branch, master, updated. v3.9.0-rc4-173-gf7cc2cc

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  f7cc2cc2b693061c39ea6452935c67396da4b9e4 (commit)
       via  d194bd915be3d99fda2d9e504655a78ee983f984 (commit)
      from  b43d0fd04b635a5de56d104d7dc1ab908b739c00 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7cc2cc2b693061c39ea6452935c67396da4b9e4
commit f7cc2cc2b693061c39ea6452935c67396da4b9e4
Merge: b43d0fd d194bd9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 27 14:54:16 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jun 27 10:54:25 2017 -0400

    Merge topic 'FindDoxygen-internal-var'
    
    d194bd91 FindDoxygen: Add private prefix to internal variables
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1012


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d194bd915be3d99fda2d9e504655a78ee983f984
commit d194bd915be3d99fda2d9e504655a78ee983f984
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 27 08:38:15 2017 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 27 10:45:45 2017 -0400

    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.

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")

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindDoxygen.cmake |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake