diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index d57ece196a4..a0c7ca5e883 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -330,6 +330,13 @@ jobs: message(FATAL_ERROR "Failed to install dependencies") endif() endif() + execute_process( + COMMAND python -m pip install --user beautifulsoup4 lxml + RESULT_VARIABLE result + ) + if (NOT result EQUAL 0) + message(FATAL_ERROR "Failed to install python dependencies") + endif() - name: Build shell: cmake -P {0} diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 4d702e889d1..683b8ba4736 100644 --- a/src/shared/CMakeLists.txt +++ b/src/shared/CMakeLists.txt @@ -32,9 +32,11 @@ if (ENABLE_BUILD_QBS) set(QBS_LIBEXEC_INSTALL_DIR "${IDE_LIBEXEC_PATH}" CACHE STRING "" FORCE) set(QBS_PLUGINS_INSTALL_BASE "${IDE_PLUGIN_PATH}" CACHE STRING "" FORCE) set(QBS_RESOURCES_INSTALL_BASE "${IDE_DATA_PATH}/qbs" CACHE STRING "" FORCE) + set(QBS_DOC_INSTALL_DIR "${IDE_DOC_PATH}" CACHE STRING "" FORCE) set(QBS_HEADERS_INSTALL_DIR "${IDE_DATA_PATH}/qbs/include/qbs" CACHE STRING "" FORCE) set(INSTALL_PUBLIC_HEADERS OFF) set(WITH_TESTS OFF) + set(QBS_INSTALL_QCH_DOCS ${WITH_DOCS}) add_subdirectory(qbs) endif()