diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-09-17 13:22:00 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-09-17 12:49:53 +0000 |
| commit | 351461d3680ec680a606fc5333e529c00e161c50 (patch) | |
| tree | 21c126656b2d0e8021fe124fcf06965ef5f4e09b | |
| parent | a4fb810c09ed79d739bdf28076792ac458c0fcbc (diff) | |
| download | qbs-351461d3680ec680a606fc5333e529c00e161c50.tar.gz | |
cmake: Do not fail build if docs cannot be built
Change-Id: I597c984e98ff5bd5b05d82e4ec27c20ea59fba30
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | cmake/QbsDocumentation.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cmake/QbsDocumentation.cmake b/cmake/QbsDocumentation.cmake index 99b0e21a8..a8ef1bb97 100644 --- a/cmake/QbsDocumentation.cmake +++ b/cmake/QbsDocumentation.cmake @@ -158,11 +158,13 @@ function(_qbs_setup_qdoc_targets _qdocconf_file _retval) if (NOT Python3_Interpreter_FOUND) message(WARNING "Cannot find python3 binary. Qbs documentation will not be built.") + return() endif() _find_python_module(lxml) _find_python_module(bs4) if (NOT PY_LXML OR NOT PY_BS4) - message(FATAL_ERROR "Cannot import lxml and bs4 python modules. Qbs documentation will not be built.") + message(WARNING "Cannot import lxml and bs4 python modules. Qbs documentation will not be built.") + return() endif() set(_fixed_html_artifact "${CMAKE_CURRENT_BINARY_DIR}/qbsdoc.dummy") @@ -199,6 +201,11 @@ function(_qbs_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir) return() endif() + set(_html_target "qbs_html_docs_${_target}") + if (NOT TARGET ${_html_target}) + return() + endif() + get_filename_component(_target "${_qdocconf_file}" NAME_WE) set(_qch_outputdir "${_arg_QCH_DIR}") @@ -216,7 +223,6 @@ function(_qbs_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir) VERBATIM ) - set(_html_target "qbs_html_docs_${_target}") set(_qch_target "qbs_qch_docs_${_target}") add_custom_target("${_qch_target}" DEPENDS "${_qch_artifact}") add_dependencies(qbs_qch_docs "${_qch_target}") |