summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-03 13:20:29 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-08-03 13:20:29 (GMT)
commit4b0e1dc0a4ae5f4fdb680e1ec27cd1f392d64ffb (patch)
tree8c45190732117d2691f7123bc379edfdbff95ae1
parent16e449cc7221cbf77a2bac02a91d986703fe6483 (diff)
parent7d7446c905623420482dda9eb6e10e0f604f6fd9 (diff)
downloadCMake-4b0e1dc0a4ae5f4fdb680e1ec27cd1f392d64ffb.zip
CMake-4b0e1dc0a4ae5f4fdb680e1ec27cd1f392d64ffb.tar.gz
CMake-4b0e1dc0a4ae5f4fdb680e1ec27cd1f392d64ffb.tar.bz2
Merge topic 'doc-without-continue'
7d7446c9 Utilities/Sphinx: Remove use of continue() method
-rw-r--r--Utilities/Sphinx/CMakeLists.txt19
1 files changed, 11 insertions, 8 deletions
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()