Git commit a26e04f93bddced119bdb40fd7b2c408eb8652b6 by Marco Martin. Committed on 26/03/2014 at 14:19. Pushed by mart into branch 'master'.
make documentation build M +8 -0 CMakeLists.txt M +1 -1 doc/CMakeLists.txt C +0 -0 doc/plasmapkg/CMakeLists.txt [from: doc/CMakeLists.txt - 100% similarity] R +0 -0 doc/plasmapkg/man-plasmapkg.1.docbook [from: doc/man-plasmapkg.1.docbook - 100% similarity] http://commits.kde.org/plasma-framework/a26e04f93bddced119bdb40fd7b2c408eb8652b6 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1764afb..638e5cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,11 @@ find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED) find_package(KF5WindowSystem ${KF5_VERSION} REQUIRED) find_package(KF5XmlGui ${KF5_VERSION} REQUIRED) +find_package(KF5DocTools ${KF5_VERSION}) +set_package_properties(X11 PROPERTIES DESCRIPTION "Tools to generate documentation" + TYPE OPTIONAL + ) + #optional features find_package(X11 MODULE) set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries" @@ -177,6 +182,9 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h include_directories(${CMAKE_CURRENT_BINARY_DIR}) ################# list the subdirectories ################# +if (KF5DocTools) + add_subdirectory(doc) +endif() add_subdirectory(src) add_subdirectory(desktoptheme) add_subdirectory(examples) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 93b1d24..2acc3f0 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,2 +1,2 @@ -kdoctools_create_manpage(man-plasmapkg.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR}) +add_subdirectory(plasmapkg) diff --git a/doc/CMakeLists.txt b/doc/plasmapkg/CMakeLists.txt similarity index 100% copy from doc/CMakeLists.txt copy to doc/plasmapkg/CMakeLists.txt diff --git a/doc/man-plasmapkg.1.docbook b/doc/plasmapkg/man-plasmapkg.1.docbook similarity index 100% rename from doc/man-plasmapkg.1.docbook rename to doc/plasmapkg/man-plasmapkg.1.docbook