gnucash maint: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/8447f426 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/712714cf (commit)
	from  https://github.com/Gnucash/gnucash/commit/49334906 (commit)



commit 8447f42674d4ae60fff59cd8a957bb71d71af2cc
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon May 27 14:47:35 2019 +0200

    Bug 797126 - It is annoying to run cmake to get an updated mo file
    
    Add missing dependency in order to make the po-gmo and po-gmo-build targets acually work.

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 202ef7198..7c2aff7fd 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -35,6 +35,7 @@ foreach(lingua ${ALL_LINGUAS})
       COMMAND ${CMAKE_COMMAND} -E env
         ${GETTEXT_MSGFMT_EXECUTABLE}
             -o ${_OUTPUT_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${lingua}.po
+      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${lingua}.po
   )
   set(_BUILD_FILE_DIR ${DATADIR_BUILD}/locale/${lingua}/LC_MESSAGES)
   make_directory(${_BUILD_FILE_DIR})

commit 712714cf94fa7c952aef42d81cd0c31f3c5cfe84
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon May 27 14:01:05 2019 +0200

    Bug 797207 - Chart reports show blank when run from the build directory
    
    jqplot files were not copied to the build environment

diff --git a/gnucash/report/jqplot/CMakeLists.txt b/gnucash/report/jqplot/CMakeLists.txt
index eefd36092..1095938a4 100644
--- a/gnucash/report/jqplot/CMakeLists.txt
+++ b/gnucash/report/jqplot/CMakeLists.txt
@@ -31,5 +31,6 @@ set(gncjqplot_DATA
 )
 
 install(FILES ${gncjqplot_DATA} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/jqplot)
+file(COPY ${gncjqplot_DATA} DESTINATION ${DATADIR_BUILD}/gnucash/jqplot)
 
 set_dist_list(jqplot_DIST CMakeLists.txt jquery.js ${gncjqplot_DATA})



Summary of changes:
 gnucash/report/jqplot/CMakeLists.txt | 1 +
 po/CMakeLists.txt                    | 1 +
 2 files changed, 2 insertions(+)