gnucash master: Fix distcheck for chartjs

Geert Janssens gjanssens at code.gnucash.org
Thu Jun 6 12:54:30 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/598c374c (commit)
	from  https://github.com/Gnucash/gnucash/commit/fc3579fc (commit)



commit 598c374c920c47205d7b40d686bd08b8d4a9c1e9
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Jun 6 18:53:57 2019 +0200

    Fix distcheck for chartjs

diff --git a/borrowed/chartjs/CMakeLists.txt b/borrowed/chartjs/CMakeLists.txt
index a98ff01f1..cf371aeb9 100644
--- a/borrowed/chartjs/CMakeLists.txt
+++ b/borrowed/chartjs/CMakeLists.txt
@@ -1,9 +1,15 @@
 
-set(gncchartjs_DATA
+set(chartjs_DATA
   Chart.bundle.min.js
   Chart.bundle.js
 )
 
-install (FILES ${gncchartjs_DATA} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/chartjs)
+file(GLOB_RECURSE chartjs_NOINST_DATA
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    samples Chart*)
 
-set_dist_list(chartjs_DIST CMakeLists.txt ${chartjs_DATA})
+list(REMOVE_ITEM ${chartjs_DATA})
+
+install (FILES ${chartjs_DATA} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/chartjs)
+
+set_dist_list(chartjs_DIST CMakeLists.txt ${chartjs_DATA} ${chartjs_NOINST_DATA})



Summary of changes:
 borrowed/chartjs/CMakeLists.txt | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)



More information about the gnucash-changes mailing list