diff options
| author | Olli Salli <ollisal@gmail.com> | 2011-05-25 17:55:59 +0300 |
|---|---|---|
| committer | Olli Salli <ollisal@gmail.com> | 2011-05-25 18:27:34 +0300 |
| commit | 25cf160fb837ca96fccf8035bafa069056928de0 (patch) | |
| tree | 7edc7544e9d25b8137bf077fe0ad1990ed1df917 | |
| parent | 05630f91b0cbdd9392b6a0f081b0512b8b716a53 (diff) | |
Make Qt crosslinks in uploaded docs point to doc.qt.nokia.com
| -rw-r--r-- | cmake/modules/Doxygen.cmake | 10 | ||||
| -rw-r--r-- | doxygen.cfg.in | 2 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 15 |
3 files changed, 23 insertions, 4 deletions
diff --git a/cmake/modules/Doxygen.cmake b/cmake/modules/Doxygen.cmake index 34ce8664..804c217f 100644 --- a/cmake/modules/Doxygen.cmake +++ b/cmake/modules/Doxygen.cmake @@ -10,11 +10,17 @@ if(DOXYGEN_FOUND) find_package_handle_standard_args(QHELPGENERATOR DEFAULT_MSG QHELPGENERATOR_EXECUTABLE) set(QT_TAGS_FILE ${QT_DOC_DIR}/html/qt.tags) - if(NOT EXISTS ${QT_TAGS_FILE}) + if(EXISTS ${QT_TAGS_FILE}) + find_package(Perl) + + if (NOT PERL_FOUND) + message(WARNING "Perl was not found. Qt crosslinks in uploaded docs won't be valid.") + endif (NOT PERL_FOUND) + else(EXISTS ${QT_TAGS_FILE}) message(WARNING "html/qt.tags not found in ${QT_DOC_DIR}. Set the QT_DOC_DIR variable to point to its location to enable crosslinking.") unset(QT_TAGS_FILE) - endif(NOT EXISTS ${QT_TAGS_FILE}) + endif(EXISTS ${QT_TAGS_FILE}) set(abs_top_builddir ${CMAKE_BINARY_DIR}) set(abs_top_srcdir ${CMAKE_SOURCE_DIR}) diff --git a/doxygen.cfg.in b/doxygen.cfg.in index 76ed1813..bcab815f 100644 --- a/doxygen.cfg.in +++ b/doxygen.cfg.in @@ -1212,7 +1212,7 @@ SKIP_FUNCTION_MACROS = YES # FIXME: for some reason, doxygen doesn't seem to emit a doxygen= attribute at all # in the <a> element if there is no location, in which case there is nothing for # installdox to rewrite. -TAGFILES = ${QT_TAGS_FILE}=/you/forgot/to/run/installdox/with/qt.tags/ +TAGFILES = ${QT_TAGS_FILE}=/you/forgot/to/run/installdox # When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index e7963f70..3c023216 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -26,11 +26,24 @@ if (GIT_BRANCH_CURRENT) endif (HAVE_GIT_BRANCH) endif (GIT_BRANCH_CURRENT) +if (PERL_FOUND) + add_custom_target(maintainer-fix-qt-links-in-docs + ${PERL_EXECUTABLE} doc/html/installdox -l qt.tags@http://doc.qt.nokia.com/latest/ doc/html/*.html + + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) + add_dependencies(maintainer-fix-qt-links-in-docs doxygen-doc _maintainer-upload-release-check) +endif (PERL_FOUND) + add_custom_target(maintainer-upload-release-docs rsync -rtOvzPp --chmod=Dg+s,ug+rwX,o=rX doc/html/ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-qt4/ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -add_dependencies(maintainer-upload-release-docs doxygen-doc _maintainer-upload-release-check) + +if (PERL_FOUND) + add_dependencies(maintainer-upload-release-docs maintainer-fix-qt-links-in-docs) +else (PERL_FOUND) + add_dependencies(maintainer-upload-release-docs doxygen-doc _maintainer-upload-release-check) +endif (PERL_FOUND) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/maintainer-upload-release-check.sh " #!/bin/sh |