From 19353c9857d1e26c6508c2fc7dd530e6ee0ef316 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sat, 14 Mar 2015 12:44:49 +0000 Subject: Warn about icon filenames with leading characters. Through a quirk of implementation, old-style icon filenames are accepted by the new-style ecm_install_icons function. It's too late to change it now, as that would break existing projects, but we can warn about it. REVIEW: 122941 --- tests/ECMInstallIconsTest/16-apps-cmake.png | Bin 233 -> 0 bytes tests/ECMInstallIconsTest/CMakeLists.txt | 15 ++++++++------- .../hicolor/16x16/actions/old-style-name.png | Bin 0 -> 233 bytes .../ECMInstallIconsTest/hi16-actions-old-style-name.png | Bin 0 -> 233 bytes tests/ECMInstallIconsTest/subdir/16-apps-cmake.png | Bin 0 -> 233 bytes 5 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 tests/ECMInstallIconsTest/16-apps-cmake.png create mode 100644 tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/16x16/actions/old-style-name.png create mode 100644 tests/ECMInstallIconsTest/hi16-actions-old-style-name.png create mode 100644 tests/ECMInstallIconsTest/subdir/16-apps-cmake.png (limited to 'tests/ECMInstallIconsTest') diff --git a/tests/ECMInstallIconsTest/16-apps-cmake.png b/tests/ECMInstallIconsTest/16-apps-cmake.png deleted file mode 100644 index ed9a1181..00000000 Binary files a/tests/ECMInstallIconsTest/16-apps-cmake.png and /dev/null differ diff --git a/tests/ECMInstallIconsTest/CMakeLists.txt b/tests/ECMInstallIconsTest/CMakeLists.txt index 85f2d9f5..7fe4ca35 100644 --- a/tests/ECMInstallIconsTest/CMakeLists.txt +++ b/tests/ECMInstallIconsTest/CMakeLists.txt @@ -20,7 +20,7 @@ ecm_install_icons( ICONS 16-actions-computer.png 16-animations-loading.mng - 16-apps-cmake.png + subdir/16-apps-cmake.png 16-categories-system-help.mng 16-emotes-face-smile.png 16-intl-something.png @@ -36,7 +36,7 @@ ecm_install_icons( ICONS 16-actions-computer.png 16-animations-loading.mng - 16-apps-cmake.png + subdir/16-apps-cmake.png 16-categories-system-help.mng 16-emotes-face-smile.png 16-intl-something.png @@ -53,7 +53,7 @@ ecm_install_icons( ICONS 16-actions-computer.png 16-animations-loading.mng - 16-apps-cmake.png + subdir/16-apps-cmake.png 16-categories-system-help.mng 16-emotes-face-smile.png 16-intl-something.png @@ -70,7 +70,7 @@ ecm_install_icons( ICONS 16-actions-computer.png 16-animations-loading.mng - 16-apps-cmake.png + subdir/16-apps-cmake.png 16-categories-system-help.mng 16-emotes-face-smile.png 16-intl-something.png @@ -87,9 +87,10 @@ ecm_install_icons( # all these should be warned about ecm_install_icons( ICONS - aa-actions-badsize.png # ignored - badlynamedfile.png # ignored - 16-actions-badext.txt # copied + aa-actions-badsize.png # ignored + badlynamedfile.png # ignored + 16-actions-badext.txt # copied + hi16-actions-old-style-name.png # copied DESTINATION badly-named-files-test ) diff --git a/tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/16x16/actions/old-style-name.png b/tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/16x16/actions/old-style-name.png new file mode 100644 index 00000000..ed9a1181 Binary files /dev/null and b/tests/ECMInstallIconsTest/expected-tree/badly-named-files-test/hicolor/16x16/actions/old-style-name.png differ diff --git a/tests/ECMInstallIconsTest/hi16-actions-old-style-name.png b/tests/ECMInstallIconsTest/hi16-actions-old-style-name.png new file mode 100644 index 00000000..ed9a1181 Binary files /dev/null and b/tests/ECMInstallIconsTest/hi16-actions-old-style-name.png differ diff --git a/tests/ECMInstallIconsTest/subdir/16-apps-cmake.png b/tests/ECMInstallIconsTest/subdir/16-apps-cmake.png new file mode 100644 index 00000000..ed9a1181 Binary files /dev/null and b/tests/ECMInstallIconsTest/subdir/16-apps-cmake.png differ -- cgit v1.2.1