diff options
author | Alex Merry <alex.merry@kde.org> | 2015-10-14 12:10:31 +0100 |
---|---|---|
committer | Alex Merry <alex.merry@kde.org> | 2015-10-20 13:00:49 +0100 |
commit | fb7b8eea7d91772f989d5b060c86df20f2ebdb66 (patch) | |
tree | 7631daf4c7d75676cecbaead90501dc40ddca3a3 /tests/ECMInstallIconsTest/check_tree.cmake.in | |
parent | 20bf1de42b035eb669d0250f4d549c15f9256e58 (diff) | |
download | extra-cmake-modules-fb7b8eea7d91772f989d5b060c86df20f2ebdb66.tar.gz extra-cmake-modules-fb7b8eea7d91772f989d5b060c86df20f2ebdb66.tar.bz2 |
Fix ECMInstallIconsTest.
ECMInstallIcons now updates the theme cache if gtk-update-icon-cache is
available, producing files the test hadn't been expecting.. Updating the
test revealed that the old-style ecm_install_icons call only updated the
hicolor cache, and not any of the other themes.
REVIEW: 125631
Diffstat (limited to 'tests/ECMInstallIconsTest/check_tree.cmake.in')
-rw-r--r-- | tests/ECMInstallIconsTest/check_tree.cmake.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/ECMInstallIconsTest/check_tree.cmake.in b/tests/ECMInstallIconsTest/check_tree.cmake.in index 6d14246b..b9da1715 100644 --- a/tests/ECMInstallIconsTest/check_tree.cmake.in +++ b/tests/ECMInstallIconsTest/check_tree.cmake.in @@ -1,8 +1,15 @@ set(EXP_TREE "@CMAKE_CURRENT_SOURCE_DIR@/expected-tree") set(ACTUAL_TREE "@CMAKE_INSTALL_PREFIX@") +set(GENERATE_ICON_CACHE "@GENERATE_ICON_CACHE@") file(GLOB_RECURSE exp_files RELATIVE "${EXP_TREE}" "${EXP_TREE}/*") file(GLOB_RECURSE actual_files RELATIVE "${ACTUAL_TREE}" "${ACTUAL_TREE}/*") +if (NOT GENERATE_ICON_CACHE) + file(GLOB_RECURSE cache_files RELATIVE "${EXP_TREE}" "${EXP_TREE}/*.cache") + foreach(f ${cache_files}) + list(REMOVE_ITEM exp_files "${f}") + endforeach() +endif() list(SORT exp_files) list(SORT actual_files) |