wok view awesome/stuff/0001-Normalize-icon-path-names-fixes-869.patch @ rev 9420
Up: hplip to 3.11.3.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Wed Mar 30 10:42:27 2011 +0000 (2011-03-30) |
| parents | |
| children |
line source
1 From 1aedd853fcaeeafadd24512f84e6e269f5db0b4e Mon Sep 17 00:00:00 2001
2 From: Thomas Moschny <thomas.moschny@gmx.de>
3 Date: Mon, 21 Feb 2011 17:58:04 +0100
4 Subject: [PATCH] Normalize icon path names (fixes #869).
6 The elements in ${icon_sources}, as returned by file(GLOB ...) contain
7 double slashes, could be a bug in cmake. This causes building with
8 cmake 2.8.4 to fail, due to dependency problems lateron.
10 This patch works around the issue by normalizing all path names in
11 ${icon_sources} while appending them to ${ALL_ICONS}, thereby removing
12 the double slashes.
13 ---
14 CMakeLists.txt | 3 ++-
15 1 files changed, 2 insertions(+), 1 deletions(-)
17 diff --git a/CMakeLists.txt b/CMakeLists.txt
18 index 64be9b9..472bec2 100644
19 --- a/CMakeLists.txt
20 +++ b/CMakeLists.txt
21 @@ -244,14 +244,15 @@ endif()
23 # {{{ Theme icons
24 file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png)
25 -set(ALL_ICONS ${icon_sources})
27 foreach(icon ${icon_sources})
28 # Copy all icons to the build dir to simplify the following code.
29 # Source paths are interpreted relative to ${SOURCE_DIR}, target paths
30 # relative to ${BUILD_DIR}.
31 get_filename_component(icon_path ${icon} PATH)
32 + get_filename_component(icon_name ${icon} NAME)
33 file(COPY ${icon} DESTINATION ${icon_path})
34 + set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
35 endforeach()
37 macro(a_icon_convert match replacement input)
38 --
39 1.7.3.4