[Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-306-gfd93616

[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  fd93616b745218edbeaa2077da3fb78842b34a7b (commit)
       via  9cab8570faaa62766e85d09dabd844725926a706 (commit)
      from  1a6ef0bdb27fcf07e54a6754235ece70e752aa5c (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=fd93616b745218edbeaa2077da3fb78842b34a7b
commit fd93616b745218edbeaa2077da3fb78842b34a7b
Merge: 1a6ef0b 9cab857
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 10 15:29:55 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 10 10:30:16 2017 -0500

    Merge topic 'doxygen_dot'
    
    9cab8570 FindDoxygen: Fix setting of HAVE_DOT in non-backward-compat mode
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1472


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cab8570faaa62766e85d09dabd844725926a706
commit 9cab8570faaa62766e85d09dabd844725926a706
Author:     André Apitzsch <andre.apitzsch at etit.tu-chemnitz.de>
AuthorDate: Fri Nov 10 14:23:15 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 10 08:49:37 2017 -0500

    FindDoxygen: Fix setting of HAVE_DOT in non-backward-compat mode
    
    `DOXYGEN_DOT_FOUND` is only set if `_Doxygen_keep_backward_compat` is
    used (when no components are requested), so use `Doxygen_dot_FOUND`
    directly.  Preserve the "YES" or "NO" value used previously.

diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index 46bf340..d0dd0f1 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -832,7 +832,11 @@ doxygen_add_docs() for target ${targetName}")
         # and Lucent Bell Labs. The other options in this section have no
         # effect if this option is set to NO.
         # Doxygen's default value is: NO.
-        set(DOXYGEN_HAVE_DOT ${DOXYGEN_DOT_FOUND})
+        if(Doxygen_dot_FOUND)
+          set(DOXYGEN_HAVE_DOT "YES")
+        else()
+          set(DOXYGEN_HAVE_DOT "NO")
+        endif()
     endif()
 
     if(NOT DEFINED DOXYGEN_DOT_MULTI_TARGETS)

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

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


hooks/post-receive
-- 
CMake