Git commit 46c93b050ccb898981a54ddaef998887049d9967 by Kevin Ottens. Committed on 06/11/2013 at 20:36. Pushed by ervin into branch 'frameworks'.
Move to KService the docs which belong to it M +0 -2 doc/CMakeLists.txt M +3 -0 tier3/kservice/CMakeLists.txt A +2 -0 tier3/kservice/docs/CMakeLists.txt R +0 -0 tier3/kservice/docs/kbuildsycoca5/CMakeLists.txt [from: doc/kbuildsycoca5/CMakeLists.txt - 100% similarity] R +0 -0 tier3/kservice/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook [from: doc/kbuildsycoca5/man-kbuildsycoca5.8.docbook - 100% similarity] R +0 -0 tier3/kservice/docs/kdeinit5/CMakeLists.txt [from: doc/kdeinit5/CMakeLists.txt - 100% similarity] R +0 -0 tier3/kservice/docs/kdeinit5/man-kdeinit5.8.docbook [from: doc/kdeinit5/man-kdeinit5.8.docbook - 100% similarity] R +0 -0 tier3/kservice/docs/servicetype-inheritance-design.txt [from: tier3/kservice/doc/servicetype-inheritance-design.txt - 100% similarity] http://commits.kde.org/kdelibs/46c93b050ccb898981a54ddaef998887049d9967 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 5b66a72..c365d67 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -3,9 +3,7 @@ add_subdirectory( common ) add_subdirectory( kioslave ) if (NOT WIN32) - add_subdirectory( kbuildsycoca5 ) add_subdirectory( kcookiejar4 ) - add_subdirectory( kdeinit5 ) add_subdirectory( makekdewidgets ) add_subdirectory( sonnet ) add_subdirectory( kde4support ) diff --git a/tier3/kservice/CMakeLists.txt b/tier3/kservice/CMakeLists.txt index c218ca8..8506837 100644 --- a/tier3/kservice/CMakeLists.txt +++ b/tier3/kservice/CMakeLists.txt @@ -34,6 +34,7 @@ if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") find_package(KCrash ${KF5_VERSION} REQUIRED) find_package(KDBusAddons ${KF5_VERSION} REQUIRED) find_package(KI18n ${KF5_VERSION} REQUIRED) + find_package(KDocTools REQUIRED) endif() # create a Config.cmake and a ConfigVersion.cmake file and install them @@ -58,6 +59,8 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KServiceConfig.cmake" install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kservice_version.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) +# Enable when kdoctools will be usable from the outside (macros are broken ATM) +#add_subdirectory(docs) add_subdirectory(src) add_subdirectory(autotests) add_subdirectory(tests) diff --git a/tier3/kservice/docs/CMakeLists.txt b/tier3/kservice/docs/CMakeLists.txt new file mode 100644 index 0000000..86ed60b --- /dev/null +++ b/tier3/kservice/docs/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(kbuildsycoca5) +add_subdirectory(kdeinit5) diff --git a/doc/kbuildsycoca5/CMakeLists.txt b/tier3/kservice/docs/kbuildsycoca5/CMakeLists.txt similarity index 100% rename from doc/kbuildsycoca5/CMakeLists.txt rename to tier3/kservice/docs/kbuildsycoca5/CMakeLists.txt diff --git a/doc/kbuildsycoca5/man-kbuildsycoca5.8.docbook b/tier3/kservice/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook similarity index 100% rename from doc/kbuildsycoca5/man-kbuildsycoca5.8.docbook rename to tier3/kservice/docs/kbuildsycoca5/man-kbuildsycoca5.8.docbook diff --git a/doc/kdeinit5/CMakeLists.txt b/tier3/kservice/docs/kdeinit5/CMakeLists.txt similarity index 100% rename from doc/kdeinit5/CMakeLists.txt rename to tier3/kservice/docs/kdeinit5/CMakeLists.txt diff --git a/doc/kdeinit5/man-kdeinit5.8.docbook b/tier3/kservice/docs/kdeinit5/man-kdeinit5.8.docbook similarity index 100% rename from doc/kdeinit5/man-kdeinit5.8.docbook rename to tier3/kservice/docs/kdeinit5/man-kdeinit5.8.docbook diff --git a/tier3/kservice/doc/servicetype-inheritance-design.txt b/tier3/kservice/docs/servicetype-inheritance-design.txt similarity index 100% rename from tier3/kservice/doc/servicetype-inheritance-design.txt rename to tier3/kservice/docs/servicetype-inheritance-design.txt
