gnucash maint: Use a more specific regex to install icons

Geert Janssens gjanssens at code.gnucash.org
Wed Jul 4 05:31:04 EDT 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/b79c9d15 (commit)
	from  https://github.com/Gnucash/gnucash/commit/d865b149 (commit)



commit b79c9d150f1be1f4544e64a1b08ff3977fb1476f
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Wed Jul 4 11:30:58 2018 +0200

    Use a more specific regex to install icons
    
    The generic regex could exclude too much if the source directory
    is a descendant of a directory called actions or apps.
    
    Discoverd by Colin Law.

diff --git a/data/pixmaps/CMakeLists.txt b/data/pixmaps/CMakeLists.txt
index de7ca0d..57a66a2 100644
--- a/data/pixmaps/CMakeLists.txt
+++ b/data/pixmaps/CMakeLists.txt
@@ -16,22 +16,22 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 install(
     DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/icons
-    REGEX ".*/apps.*" EXCLUDE
+    REGEX "hicolor/.*/apps.*" EXCLUDE
 )
 file(
     COPY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor
     DESTINATION ${DATADIR_BUILD}/gnucash/icons
-    REGEX ".*/apps.*" EXCLUDE
+    REGEX "hicolor/.*/apps.*" EXCLUDE
 )
 
 install(
     DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION  ${CMAKE_INSTALL_DATADIR}/icons
-    REGEX ".*/actions.*" EXCLUDE
+    REGEX "hicolor/.*/actions.*" EXCLUDE
 )
 file(
     COPY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor
     DESTINATION ${DATADIR_BUILD}/icons
-    REGEX ".*/actions.*" EXCLUDE
+    REGEX "hicolor/.*/actions.*" EXCLUDE
 )
 
 set(gncpixmap_DATA



Summary of changes:
 data/pixmaps/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list