[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-59-g494b416

[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  494b416de52ed4f24eaf69dec91747435e90dbfb (commit)
       via  8282547e0f9d7370e6f84f97a448b9842009c8c8 (commit)
      from  3550f2532b4455fe539b57e80112494b4be5bf41 (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=494b416de52ed4f24eaf69dec91747435e90dbfb
commit 494b416de52ed4f24eaf69dec91747435e90dbfb
Merge: 3550f25 8282547
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 8 09:40:12 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 8 09:40:12 2016 -0500

    Merge topic 'install-man-conditionally' into next
    
    8282547e Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8282547e0f9d7370e6f84f97a448b9842009c8c8
commit 8282547e0f9d7370e6f84f97a448b9842009c8c8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 8 09:37:24 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 8 09:38:18 2016 -0500

    Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957)

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

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

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


hooks/post-receive
-- 
CMake