From d648b29d0d99f59fb833ec1ff9187a889bfe4c1d Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 19 Nov 2017 17:20:26 -0800 Subject: [PATCH] Fix distribution paths for resource files. glib-compile-resources lists the resource files as absolute paths, but SET_LOCAL_DIST expects relative paths; the result was that the tarball code was looking for ${CMAKE_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/foo. This change strips off ${CMAKE_CURRENT_SOURCE_DIR} from the filenames before passing them to SET_LOCAL_DIST. --- gnucash/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt index 205bbfd3a1..69fc47ef60 100644 --- a/gnucash/CMakeLists.txt +++ b/gnucash/CMakeLists.txt @@ -237,9 +237,16 @@ IF (WIN32) INSTALL(PROGRAMS ${CMD_FILE} DESTINATION bin) ENDIF(WIN32) +# The GResource Files are absolute paths but SET_LOCAL_DIST requires +# relative paths. +FOREACH(gres_file ${gresource_files}) + FILE(RELATIVE_PATH rel_file ${CMAKE_CURRENT_SOURCE_DIR} ${gres_file}) + LIST(REMOVE_ITEM gresource_files ${gres_file}) + LIST(APPEND gresource_files ${rel_file}) +ENDFOREACH() SET_LOCAL_DIST(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script - gnucash-bin.c gnucash.rc.in gnucash-valgrind.in gnucash-gresourses.xml ${gresource_files} + gnucash-bin.c gnucash.rc.in gnucash-valgrind.in gnucash-gresources.xml ${gresource_files} Makefile.am ${gnucash_EXTRA_DIST}) SET(gnucash_DIST ${gnucash_DIST_local} ${gnome_DIST} ${gnome_search_DIST}