From 7c85ade10bc2fb7d0644f67c35fc845bfd69952a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 26 Jul 2021 13:18:27 +0200 Subject: [PATCH] Use common rules for build and install documentation and translations. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 8c28c84ffaa6a8b1891b5703f5292f3990d990ca) --- CMakeLists.txt | 8 ++++++-- doc/en/CMakeLists.txt | 1 - doc/{ => html}/CMakeLists.txt | 2 -- doc/{ => html}/configure.png | Bin doc/{ => html}/hi48-app-klcddimmer.png | Bin doc/{ => html}/klcddimmer-screenshot.png | Bin doc/{ => html}/klcddimmer.html | 0 translations/CMakeLists.txt | 1 - translations/messages/CMakeLists.txt | 14 -------------- 9 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 doc/en/CMakeLists.txt rename doc/{ => html}/CMakeLists.txt (88%) rename doc/{ => html}/configure.png (100%) rename doc/{ => html}/hi48-app-klcddimmer.png (100%) rename doc/{ => html}/klcddimmer-screenshot.png (100%) rename doc/{ => html}/klcddimmer.html (100%) delete mode 100644 translations/CMakeLists.txt delete mode 100644 translations/messages/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 97da882..d2ac475 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,8 +69,12 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ##### directories add_subdirectory( src ) -tde_conditional_add_subdirectory( BUILD_DOC doc ) -tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations ) + + +##### other data ################################ + +tde_conditional_add_project_docs( BUILD_DOC ) +tde_conditional_add_project_translations( BUILD_TRANSLATIONS ) ##### write configure files diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt deleted file mode 100644 index ba3ef3e..0000000 --- a/doc/en/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -tde_create_handbook( DESTINATION ${PROJECT_NAME} ) diff --git a/doc/CMakeLists.txt b/doc/html/CMakeLists.txt similarity index 88% rename from doc/CMakeLists.txt rename to doc/html/CMakeLists.txt index 5a5fbaf..cbd26e0 100644 --- a/doc/CMakeLists.txt +++ b/doc/html/CMakeLists.txt @@ -8,5 +8,3 @@ INSTALL( DESTINATION ${HTML_INSTALL_DIR}/en/${PROJECT_NAME} ) - -add_subdirectory( en ) diff --git a/doc/configure.png b/doc/html/configure.png similarity index 100% rename from doc/configure.png rename to doc/html/configure.png diff --git a/doc/hi48-app-klcddimmer.png b/doc/html/hi48-app-klcddimmer.png similarity index 100% rename from doc/hi48-app-klcddimmer.png rename to doc/html/hi48-app-klcddimmer.png diff --git a/doc/klcddimmer-screenshot.png b/doc/html/klcddimmer-screenshot.png similarity index 100% rename from doc/klcddimmer-screenshot.png rename to doc/html/klcddimmer-screenshot.png diff --git a/doc/klcddimmer.html b/doc/html/klcddimmer.html similarity index 100% rename from doc/klcddimmer.html rename to doc/html/klcddimmer.html diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt deleted file mode 100644 index 42b186a..0000000 --- a/translations/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -tde_auto_add_subdirectories() diff --git a/translations/messages/CMakeLists.txt b/translations/messages/CMakeLists.txt deleted file mode 100644 index 75c89f8..0000000 --- a/translations/messages/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) -string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" ) - -foreach( _po ${po_files} ) - get_filename_component( _lang ${_po} NAME_WE ) - if( "${_linguas}" MATCHES "^;*$" OR ";${_linguas};" MATCHES ";${_lang};" ) - if( "${_po}" MATCHES "^([^/]*)/.*" ) - string( REGEX REPLACE "^([^/]*)/.*" "\\1" _component "${_po}" ) - else( ) - set( _component "${PROJECT_NAME}" ) - endif( ) - tde_create_translation( FILES ${_po} LANG ${_lang} OUTPUT_NAME ${_component} ) - endif( ) -endforeach( )