gnucash-docs maint: CMake - update installation components

Geert Janssens gjanssens at code.gnucash.org
Sat Sep 7 09:42:25 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/9f9e20f6 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/67f0c717 (commit)



commit 9f9e20f623063a0840d40c9eb1a11adcc856038a
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Sep 7 15:42:19 2019 +0200

    CMake - update installation components
    
    Installation is normally only done in preparation of packaging the docs.
    At that point one would want to install all documents in a given format
    at once. So make the installation components document name independent.
    There are now two components: ghelp and chm. One for integration on linux
    into the gnome help system and one for integration on Windows.
    All other document types don't define installation targets so no other
    components for installation are defined either.

diff --git a/cmake/AddChmTarget.cmake b/cmake/AddChmTarget.cmake
index 0416b08..d6be1af 100644
--- a/cmake/AddChmTarget.cmake
+++ b/cmake/AddChmTarget.cmake
@@ -32,6 +32,6 @@ function (add_chm_target docname lang entities figures)
             "${BUILD_DIR}/${chmfile}"
             "${BUILD_DIR}/${mapfile}"
         DESTINATION "${CMAKE_INSTALL_DOCDIR}/${lang}"
-        COMPONENT "${docname}-chm")
+        COMPONENT "chm")
 
 endfunction()
diff --git a/cmake/AddGHelpTarget.cmake b/cmake/AddGHelpTarget.cmake
index a8bc9ec..a974d0d 100644
--- a/cmake/AddGHelpTarget.cmake
+++ b/cmake/AddGHelpTarget.cmake
@@ -47,8 +47,8 @@ function (add_ghelp_target docname lang entities figures)
 
     install(FILES ${source_files}
         DESTINATION "${CMAKE_INSTALL_DATADIR}/gnome/help/${docname}/${lang}"
-        COMPONENT "${docname}-xml")
+        COMPONENT "ghelp")
     install(FILES ${figures}
         DESTINATION "${CMAKE_INSTALL_DATADIR}/gnome/help/${docname}/${lang}/figures"
-        COMPONENT "${docname}-xml")
+        COMPONENT "ghelp")
 endfunction()



Summary of changes:
 cmake/AddChmTarget.cmake   | 2 +-
 cmake/AddGHelpTarget.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)



More information about the gnucash-changes mailing list