diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-26 14:22:09 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-26 14:22:11 +0200 |
| commit | 3291a54605b3959bc15f943d279a12026f77e71b (patch) | |
| tree | cd2024678a8c379aeb121c74974cf297ee723197 | |
| parent | ceaf538ec5b502737ed1f113aea819ff72bbe21d (diff) | |
| parent | aac61d9e35374aa4a309aaa2110f0bf6f67a598b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I678f69b4f9e66d9be5aebeb222d9cf5137e30998
| -rw-r--r-- | sources/pyside2/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | sources/pyside2/doc/CMakeLists.txt | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 929a06db3..42cdf8b36 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -368,9 +368,20 @@ if (BUILD_TESTS) add_subdirectory(tests) endif () +find_program(SPHINX_BUILD sphinx-build) find_program(DOT_EXEC dot) -if (QT_SRC_DIR AND DOT_EXEC) + +if (QT_SRC_DIR AND SPHINX_BUILD AND DOT_EXEC) add_subdirectory(doc) else () - message(STATUS "QT_SRC_DIR variable not set or graphviz not found, apidoc generation targets disabled.") + set(DOCS_TARGET_DISABLED_MESSAGE "apidoc generation targets disabled.") + if (NOT QT_SRC_DIR) + message(STATUS "QT_SRC_DIR variable not set, ${DOCS_TARGET_DISABLED_MESSAGE}") + elseif (NOT SPHINX_BUILD) + message(STATUS "sphinx-build command not found, ${DOCS_TARGET_DISABLED_MESSAGE}") + elseif (NOT DOT_EXEC) + message(STATUS "graphviz not found, ${DOCS_TARGET_DISABLED_MESSAGE}") + else() + message(STATUS "Unknown issue occurred, ${DOCS_TARGET_DISABLED_MESSAGE}") + endif() endif() diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt index c5d0169d1..14af9735b 100644 --- a/sources/pyside2/doc/CMakeLists.txt +++ b/sources/pyside2/doc/CMakeLists.txt @@ -8,11 +8,6 @@ add_custom_target(qdoc3 COMMENT "Running qdoc3 against Qt source code..." SOURCE "pyside.qdocconf") - -find_program(SPHINX_BUILD NAMES sphinx-build) -if (${SPHINX_BUILD} MATCHES "SPHINX_BUILD-NOTFOUND") - message(FATAL_ERROR "sphinx-build command not found.") -endif() add_custom_target(apidoc COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/rst COMMAND ${SHIBOKEN_PYTHON_INTERPRETER} ${SPHINX_BUILD} -b html ${CMAKE_CURRENT_BINARY_DIR}/rst html |