From edb4ff6b98c26c925b54025375ec49ec227ad346 Mon Sep 17 00:00:00 2001 From: hefee Date: Mon, 4 Feb 2013 18:10:51 +0100 Subject: [PATCH 1/3] adding doc to default if CREATEDOC is set --- doc/CMakeLists.txt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 084eb167a0..dc1887614b 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -13,7 +13,13 @@ if(SPHINX_FOUND) set(LATEX_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY) - add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...") + + if(CREATEDOC) + add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...") + else() + add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...") + endif() + if(PDFLATEX_FOUND) # if this still fails on Debian/Ubuntu, run # apt-get install texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended @@ -26,6 +32,7 @@ if(SPHINX_FOUND) add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf DEPENDS doc-latex ) add_dependencies(doc doc-pdf) + install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif(PDFLATEX_FOUND) if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}) add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE} @@ -37,17 +44,20 @@ if(SPHINX_FOUND) ${SPHINX_QCH_DIR}/*.qhcp DEPENDS doc-qch-sphinx ) add_dependencies(doc doc-qch) + install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() add_custom_target( doc-html ${SPHINX_EXECUTABLE} -q -c . -b html -d ${SPHINX_CACHE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${SPHINX_HTML_DIR} ) + install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) add_custom_target( doc-man ${SPHINX_EXECUTABLE} -q -c . -b man -d ${SPHINX_CACHE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${SPHINX_MAN_DIR} ) + install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR}) ## Building CHM files requires HTML Help Workshop. Since it requires wine ## with special dependencies, it's impossible to write a cmake check for it. ## This is why doc-chm is not a dependency for doc. Instead, run From 1f4ea2c60eeba14d4c26837ba3f12685b5cbbbfa Mon Sep 17 00:00:00 2001 From: hefee Date: Mon, 4 Feb 2013 18:31:48 +0100 Subject: [PATCH 2/3] only add instalation dir if we are creating doc --- doc/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index dc1887614b..bd6fc8cd2e 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -16,6 +16,8 @@ if(SPHINX_FOUND) if(CREATEDOC) add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...") + install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) + install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR}) else() add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...") endif() @@ -32,7 +34,9 @@ if(SPHINX_FOUND) add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf DEPENDS doc-latex ) add_dependencies(doc doc-pdf) - install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) + if(CREATEDOC) + install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) + endif() endif(PDFLATEX_FOUND) if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}) add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE} @@ -44,20 +48,20 @@ if(SPHINX_FOUND) ${SPHINX_QCH_DIR}/*.qhcp DEPENDS doc-qch-sphinx ) add_dependencies(doc doc-qch) - install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) + if(CREATEDOC) + install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) + endif() endif() add_custom_target( doc-html ${SPHINX_EXECUTABLE} -q -c . -b html -d ${SPHINX_CACHE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${SPHINX_HTML_DIR} ) - install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) add_custom_target( doc-man ${SPHINX_EXECUTABLE} -q -c . -b man -d ${SPHINX_CACHE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${SPHINX_MAN_DIR} ) - install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR}) ## Building CHM files requires HTML Help Workshop. Since it requires wine ## with special dependencies, it's impossible to write a cmake check for it. ## This is why doc-chm is not a dependency for doc. Instead, run From 0ebcdbbb3f2b3ff7a483639fba0be4911d6d51e3 Mon Sep 17 00:00:00 2001 From: hefee Date: Fri, 8 Feb 2013 18:57:25 +0100 Subject: [PATCH 3/3] no more different cmake parameter is needed --- doc/CMakeLists.txt | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index bd6fc8cd2e..54a4f2bd7a 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -14,13 +14,9 @@ if(SPHINX_FOUND) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in" conf.py @ONLY) - if(CREATEDOC) - add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...") - install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) - install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR}) - else() - add_custom_target(doc DEPENDS doc-html doc-man COMMENT "Building documentation...") - endif() + add_custom_target(doc ALL DEPENDS doc-html doc-man COMMENT "Building documentation...") + install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) + install(DIRECTORY ${SPHINX_MAN_DIR} DESTINATION ${CMAKE_INSTALL_MANDIR}) if(PDFLATEX_FOUND) # if this still fails on Debian/Ubuntu, run @@ -34,9 +30,7 @@ if(SPHINX_FOUND) add_custom_target(doc-pdf make -C ${SPHINX_PDF_DIR} all-pdf DEPENDS doc-latex ) add_dependencies(doc doc-pdf) - if(CREATEDOC) - install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) - endif() + install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif(PDFLATEX_FOUND) if (EXISTS ${QT_QCOLLECTIONGENERATOR_EXECUTABLE}) add_custom_target( doc-qch-sphinx ${SPHINX_EXECUTABLE} @@ -48,9 +42,7 @@ if(SPHINX_FOUND) ${SPHINX_QCH_DIR}/*.qhcp DEPENDS doc-qch-sphinx ) add_dependencies(doc doc-qch) - if(CREATEDOC) - install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) - endif() + install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${CMAKE_INSTALL_DOCDIR}) endif() add_custom_target( doc-html ${SPHINX_EXECUTABLE} -q -c . -b html