diff options
| author | Christophe Giboudeaux <christophe@krop.fr> | 2020-02-07 17:02:27 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-12 08:45:22 +0000 |
| commit | aa94565f896674321f791735e774bd620b63c175 (patch) | |
| tree | 9ecb44dc7eab04a9475eb9880ba953e7ef174c45 | |
| parent | f126d44db6472a1f1c856a0146ecc8676954a010 (diff) | |
Use INSTALL_DOCDIR when possible
Hardcoding 'doc' causes issues when installing qtbase but also
when trying to build the other modules documentation.
Change-Id: I5c57852add59d0dc0d067813feea0bbb0962c84b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index d2d43b7910..4456ea99f1 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -3486,14 +3486,14 @@ function(qt_add_docs) get_filename_component(doc_target "${doc_project}" NAME_WLE) if (QT_WILL_INSTALL) - set(qdoc_output_dir "${CMAKE_BINARY_DIR}/doc/${doc_target}") - set(index_dir "${CMAKE_BINARY_DIR}/doc") + set(qdoc_output_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}/${doc_target}") + set(index_dir "${CMAKE_BINARY_DIR}/${INSTALL_DOCDIR}") elseif (QT_SUPERBUILD) - set(qdoc_output_dir "${CMAKE_INSTALL_PREFIX}/qtbase/doc/${doc_target}") - set(index_dir "${CMAKE_INSTALL_PREFIX}/qtbase/doc") + set(qdoc_output_dir "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_DOCDIR}/${doc_target}") + set(index_dir "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_DOCDIR}") else() - set(qdoc_output_dir "${CMAKE_INSTALL_PREFIX}/doc/${doc_target}") - set(index_dir "${CMAKE_INSTALL_PREFIX}/doc") + set(qdoc_output_dir "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}/${doc_target}") + set(index_dir "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}") endif() # qtattributionsscanner @@ -3508,7 +3508,7 @@ function(qt_add_docs) # prepare docs target set(prepare_qdoc_args -outputdir "${qdoc_output_dir}" - -installdir "${QT_INSTALL_DIR}/doc" + -installdir "${QT_INSTALL_DIR}/${INSTALL_DOCDIR}" "${target_source_dir}/${doc_project}" -prepare -indexdir "${index_dir}" @@ -3517,9 +3517,9 @@ function(qt_add_docs) ) if (QT_SUPERBUILD AND NOT QT_WILL_INSTALL) - set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/qtbase/doc") + set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_DOCDIR}") else() - set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/doc") + set(qt_install_docs_env "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}") endif() set(qdoc_env_args @@ -3593,7 +3593,7 @@ function(qt_add_docs) COMMAND ${CMAKE_COMMAND} -E copy_directory "${qdoc_output_dir}" "${CMAKE_INSTALL_PREFIX}/${INSTALL_DOCDIR}/${doc_target}" - COMMENT "Installing html docs for target {$target}" + COMMENT "Installing html docs for target ${target}" ) add_custom_target(install_qch_docs_${target} |