diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-22 21:46:56 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-10-23 11:36:48 +0200 |
| commit | 6681fa7b738e89fbac5f556389c0c581802ea8de (patch) | |
| tree | 36a866360ba6ea9cd1a3ed557694816499cd3d05 /cmake | |
| parent | 1f53a91ed367c874736cba6d84340e579c3b899e (diff) | |
CMake: Allow docs generation without installing in top-level builds
This patch allows in top-level prefix builds to build Qt and to generate
the documentation without running cmake --install first.
For top-level builds we now always use the qdoc binary from the build
directory, not the installation directory.
We also have to copy the global doc files to the build directory to make
them accessible to the generate_docs target.
Change-Id: I2251603418fc3df9a21c7f2892789e9ff6c8cc21
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtDocsHelpers.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake index 0857f18eee..cbe4cbd309 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake @@ -16,7 +16,9 @@ function(qt_internal_add_docs) return() endif() - if (QT_SUPERBUILD OR QT_WILL_INSTALL) + if(QT_SUPERBUILD) + set(doc_tools_dir "${QtBase_BINARY_DIR}/${INSTALL_BINDIR}") + elseif(QT_WILL_INSTALL) set(doc_tools_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_BINDIR}") else() set(doc_tools_dir "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/qtbase/${INSTALL_BINDIR}") @@ -80,7 +82,9 @@ function(qt_internal_add_docs) "${include_path_args}" ) - if (QT_WILL_INSTALL) + if(QT_SUPERBUILD) + set(qt_install_docs_env "${QtBase_BINARY_DIR}/${INSTALL_DOCDIR}") + elseif(QT_WILL_INSTALL) set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}") else() set(qt_install_docs_env "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_DOCDIR}") |