From 8c180d8033d4bbb04f11123703f18ca1aabe0647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 15 Jan 2021 13:12:21 +0100 Subject: [PATCH] Use common cmake rules for documentation. Move the documentation to the usual layout. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 1 + doc/CMakeLists.txt | 34 +++++++++++++++++++ .../doc => doc/en}/index.docbook | 0 .../doc => doc}/man/CMakeLists.txt | 0 .../doc => doc}/man/tdenetworkmanager.1 | 0 tdenetworkmanager/CMakeLists.txt | 1 - tdenetworkmanager/doc/CMakeLists.txt | 11 ------ tdenetworkmanager/doc/Makefile.am | 3 -- 8 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 doc/CMakeLists.txt rename {tdenetworkmanager/doc => doc/en}/index.docbook (100%) rename {tdenetworkmanager/doc => doc}/man/CMakeLists.txt (100%) rename {tdenetworkmanager/doc => doc}/man/tdenetworkmanager.1 (100%) delete mode 100644 tdenetworkmanager/doc/CMakeLists.txt delete mode 100644 tdenetworkmanager/doc/Makefile.am diff --git a/CMakeLists.txt b/CMakeLists.txt index 7818cdb..6b8933d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ##### source directories ######################## add_subdirectory( ${PROJECT_NAME} ) +tde_conditional_add_subdirectory( BUILD_DOC doc ) tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations ) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..f6eec15 --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,34 @@ +file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * ) +list( REMOVE_ITEM _dirs html man ) + +string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" ) + +foreach( _dir IN LISTS _dirs ) + if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} + AND ( "${_dir}" STREQUAL "en" OR + "${_linguas}" MATCHES "^;*$" OR + ";${_linguas};" MATCHES ";${_dir};" )) + file( GLOB _doc_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} ${_dir}/*.docbook ) + if( _doc_files ) + list( FIND _doc_files "index.docbook" _find_index ) + if( -1 EQUAL _find_index ) + set( _noindex "NOINDEX" ) + else() + unset( _noindex ) + endif() + tde_create_handbook( + SOURCE_BASEDIR ${_dir} + ${_noindex} + LANG ${_dir} + DESTINATION ${PROJECT_NAME} + ) + endif() + endif() +endforeach() + +if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/CMakeLists.txt ) + add_subdirectory( html ) +endif() +if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/man/CMakeLists.txt ) + add_subdirectory( man ) +endif() diff --git a/tdenetworkmanager/doc/index.docbook b/doc/en/index.docbook similarity index 100% rename from tdenetworkmanager/doc/index.docbook rename to doc/en/index.docbook diff --git a/tdenetworkmanager/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt similarity index 100% rename from tdenetworkmanager/doc/man/CMakeLists.txt rename to doc/man/CMakeLists.txt diff --git a/tdenetworkmanager/doc/man/tdenetworkmanager.1 b/doc/man/tdenetworkmanager.1 similarity index 100% rename from tdenetworkmanager/doc/man/tdenetworkmanager.1 rename to doc/man/tdenetworkmanager.1 diff --git a/tdenetworkmanager/CMakeLists.txt b/tdenetworkmanager/CMakeLists.txt index 7e5b76e..1539524 100644 --- a/tdenetworkmanager/CMakeLists.txt +++ b/tdenetworkmanager/CMakeLists.txt @@ -13,7 +13,6 @@ add_subdirectory( pics ) add_subdirectory( src ) add_subdirectory( vpn-plugins ) -tde_conditional_add_subdirectory( BUILD_DOC doc ) install( diff --git a/tdenetworkmanager/doc/CMakeLists.txt b/tdenetworkmanager/doc/CMakeLists.txt deleted file mode 100644 index 76a3432..0000000 --- a/tdenetworkmanager/doc/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -################################################# -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_subdirectory( man ) - -tde_create_handbook( DESTINATION ${PROJECT_NAME} ) diff --git a/tdenetworkmanager/doc/Makefile.am b/tdenetworkmanager/doc/Makefile.am deleted file mode 100644 index 4169155..0000000 --- a/tdenetworkmanager/doc/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -KDE_LANG = en -KDE_DOCS = AUTO -