From kde-commits Sat Dec 31 16:22:26 2016 From: Yuri Chornoivan Date: Sat, 31 Dec 2016 16:22:26 +0000 To: kde-commits Subject: [ktechlab] /: Fix compilation, add docs Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=148320136207328 Git commit 53208c06e76c6c578e8fd43879fd7dfd304762fd by Yuri Chornoivan. Committed on 31/12/2016 at 16:22. Pushed by yurchor into branch 'master'. Fix compilation, add docs M +0 -1 CMakeLists.txt M +1 -18 doc/CMakeLists.txt M +1 -17 doc/en/CMakeLists.txt https://commits.kde.org/ktechlab/53208c06e76c6c578e8fd43879fd7dfd304762fd diff --git a/CMakeLists.txt b/CMakeLists.txt index b4460e6c..e2fac388 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,6 @@ add_subdirectory( src ) add_subdirectory( examples ) add_subdirectory( icons ) add_subdirectory( icons-kde3 ) -add_subdirectory( po ) add_subdirectory( doc ) = = diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index e00a50bb..c9381755 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,18 +1 @@ -message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(AUTODIRS)") -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR= } ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) - - -########### install files ############### - - - - -#original Makefile.am contents follow: - -## the SUBDIRS is filled automatically by am_edit. If files are = -## in this directory they are installed into the english dir -# -#KDE_LANG =3D en -#KDE_DOCS =3D AUTO -#SUBDIRS =3D $(AUTODIRS) -# +add_subdirectory( en ) diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt index 6d97ba6a..17dbae96 100644 --- a/doc/en/CMakeLists.txt +++ b/doc/en/CMakeLists.txt @@ -1,17 +1 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR= } ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) - - -########### install files ############### - - - - -#original Makefile.am contents follow: - -#KDE_DOCS =3D ktechlab -## KDE_MANS =3D ktechlab -#KDE_LANG =3D en -## KDE_DOCS =3D AUTO -# -#kde_docs_KDEDOCS =3D debugging.docbook circuits.docbook flowcode.docbook \ -# quick.docbook faq.docbook picprograms.docbook +kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}= /en SUBDIR ktechlab)