From 3d4201f172ea3e4c87872d6f710ce85edb31b6aa Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 4 Jul 2018 17:50:50 +0200 Subject: [PATCH] Adjust icon installation regex a bit more This will only exclude apps and actions if they are directories. --- 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 57a66a22b6..e44e9b465f 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 "hicolor/.*/apps.*" EXCLUDE + REGEX "hicolor/.*/apps/.*" EXCLUDE ) file( COPY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION ${DATADIR_BUILD}/gnucash/icons - REGEX "hicolor/.*/apps.*" EXCLUDE + REGEX "hicolor/.*/apps/.*" EXCLUDE ) install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION ${CMAKE_INSTALL_DATADIR}/icons - REGEX "hicolor/.*/actions.*" EXCLUDE + REGEX "hicolor/.*/actions/.*" EXCLUDE ) file( COPY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION ${DATADIR_BUILD}/icons - REGEX "hicolor/.*/actions.*" EXCLUDE + REGEX "hicolor/.*/actions/.*" EXCLUDE ) set(gncpixmap_DATA