Git commit 4298b6ebd5a23712d4c282c7f45ae4df2487a1a7 by Arnold Dumas. Committed on 16/08/2014 at 14:43. Pushed by arnolddumas into branch 'frameworks'.
Reenable doc generation. REVIEW: 119804 M +1 -2 CMakeLists.txt M +2 -2 doc/CMakeLists.txt M +1 -1 doc/index.docbook M +1 -1 doc/man-okular.1.docbook http://commits.kde.org/okular/4298b6ebd5a23712d4c282c7f45ae4df2487a1a7 diff --git a/CMakeLists.txt b/CMakeLists.txt index f78be37..4b0b3c0 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 0e5afe2..ce4e1e2 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 3237849..64b2fd2 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&okular;"> <!ENTITY latex "L<superscript>A</superscript>T<subscript>E</subscript>X"> <!ENTITY package "kdegraphics"> diff --git a/doc/man-okular.1.docbook b/doc/man-okular.1.docbook index e6134f0..ecfda1e 100644 --- a/doc/man-okular.1.docbook +++ b/doc/man-okular.1.docbook @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]>
