From 8c6b7b20d0ff7a6c41582a9c470d98c4e5838c56 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Wed, 9 Dec 2020 11:17:01 +0100 Subject: cmake: Fix path to qmake and qbs.buildVariant when building docs Change-Id: Ie9cfe4bd59ef8b692c522b4af97f9919624b37b7 Reviewed-by: Eike Ziller --- doc/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 48d0e22e7..52dfad270 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -13,6 +13,7 @@ if (QBS_INSTALL_HTML_DOCS OR QBS_INSTALL_QCH_DOCS) set(_INSTALL_QCH_DOCS false) endif() + get_target_property(_QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION) get_update_path_command(UPDATE_PATH_COMMAND) add_custom_target( BuildQbsDocumentation ALL @@ -24,12 +25,13 @@ if (QBS_INSTALL_HTML_DOCS OR QBS_INSTALL_QCH_DOCS) -d ${PROJECT_BINARY_DIR}/ config:doc-build qbs.installPrefix:undefined + qbs.buildVariant:release project.withCode:false project.withDocumentation:true profile:none modules.qbsbuildconfig.installHtml:${_INSTALL_HTML_DOCS} modules.qbsbuildconfig.installQch:${_INSTALL_QCH_DOCS} - moduleProviders.Qt.qmakeFilePaths:${QT_QMAKE_EXECUTABLE} + moduleProviders.Qt.qmakeFilePaths:${_QT_QMAKE_EXECUTABLE} COMMAND ${_QBS_OUTPUT_DIR}/qbs build --settings-dir ${PROJECT_BINARY_DIR}/settings -- cgit v1.2.3