[Cmake-commits] CMake branch, next, updated. v3.6.1-1065-g51985a8

[Brad King]

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, next has been updated
       via  51985a880bf3a93b161159cac04e8a2edb268010 (commit)
       via  7d7446c905623420482dda9eb6e10e0f604f6fd9 (commit)
      from  55c3ee103dcac6bc4659993deee069b53bcc008b (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=51985a880bf3a93b161159cac04e8a2edb268010
commit 51985a880bf3a93b161159cac04e8a2edb268010
Merge: 55c3ee1 7d7446c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 2 15:33:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 15:33:53 2016 -0400

    Merge topic 'doc-without-continue' into next
    
    7d7446c9 Utilities/Sphinx: Remove use of continue() method


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d7446c905623420482dda9eb6e10e0f604f6fd9
commit 7d7446c905623420482dda9eb6e10e0f604f6fd9
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Mon Aug 1 23:16:55 2016 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 2 15:15:00 2016 -0400

    Utilities/Sphinx: Remove use of continue() method
    
    We currently only require CMake 2.8.4 which does not provide it.

diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 257ba62..45f79dd 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -156,18 +156,21 @@ if(SPHINX_MAN)
     if("x${m}" MATCHES "^x(.+)\\.([1-9])\\.rst$")
       set(name "${CMAKE_MATCH_1}")
       set(sec "${CMAKE_MATCH_2}")
+      set(skip FALSE)
       if(NOT CMakeHelp_STANDALONE)
         if(name STREQUAL "ccmake" AND NOT BUILD_CursesDialog)
-          continue()
-        endif()
-        if(name STREQUAL "cmake-gui" AND NOT BUILD_QtDialog)
-          continue()
+          set(skip TRUE)
+        elseif(name STREQUAL "cmake-gui" AND NOT BUILD_QtDialog)
+          set(skip TRUE)
         endif()
       endif()
-      CMake_OPTIONAL_COMPONENT(sphinx-man)
-      install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec}
-              DESTINATION ${CMAKE_MAN_DIR}/man${sec}
-              ${COMPONENT})
+      if(NOT skip)
+        CMake_OPTIONAL_COMPONENT(sphinx-man)
+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec}
+                DESTINATION ${CMAKE_MAN_DIR}/man${sec}
+                ${COMPONENT})
+      endif()
+      unset(skip)
     endif()
   endforeach()
 endif()

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

Summary of changes:
 Utilities/Sphinx/CMakeLists.txt |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake