From b79c9d150f1be1f4544e64a1b08ff3977fb1476f Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 4 Jul 2018 11:30:58 +0200 Subject: [PATCH] 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. --- data/pixmaps/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/pixmaps/CMakeLists.txt b/data/pixmaps/CMakeLists.txt index de7ca0d4de..57a66a22b6 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