From 4298b6ebd5a23712d4c282c7f45ae4df2487a1a7 Mon Sep 17 00:00:00 2001 From: Arnold Dumas Date: Sat, 16 Aug 2014 16:43:46 +0200 Subject: [PATCH] Reenable doc generation. REVIEW: 119804 --- CMakeLists.txt | 3 +-- doc/CMakeLists.txt | 4 ++-- doc/index.docbook | 2 +- doc/man-okular.1.docbook | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f78be37b1..4b0b3c017 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,8 +65,7 @@ add_subdirectory( shell ) add_subdirectory( generators ) add_subdirectory( tests ) -message("TODO: doc build") -# FIXME ecm_optional_add_subdirectory(doc) +add_subdirectory(doc) include(OkularConfigureChecks.cmake) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 0e5afe2a1..ce4e1e2c2 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,5 +1,5 @@ ########### install files ############### # # -kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR okular) -kde4_create_manpage(man-okular.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) \ No newline at end of file +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR okular) +kdoctools_create_manpage(man-okular.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) \ No newline at end of file diff --git a/doc/index.docbook b/doc/index.docbook index 323784955..64b2fd218 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1,5 +1,5 @@ - ATEX"> diff --git a/doc/man-okular.1.docbook b/doc/man-okular.1.docbook index e6134f0c1..ecfda1e20 100644 --- a/doc/man-okular.1.docbook +++ b/doc/man-okular.1.docbook @@ -1,5 +1,5 @@ - ]>