4a237d064c
- Various bugfixes to Lua code. - Fix a bug causing building with cmake 2.8.4 to fail (remove double slashes from icon path names).
30 lines
1.2 KiB
Plaintext
30 lines
1.2 KiB
Plaintext
$OpenBSD: patch-CMakeLists_txt,v 1.7 2011/03/13 18:07:23 dcoppa Exp $
|
|
--- CMakeLists.txt.orig Mon Jan 17 12:38:13 2011
|
|
+++ CMakeLists.txt Wed Mar 9 13:44:50 2011
|
|
@@ -215,7 +215,7 @@ if(GENERATE_MANPAGES)
|
|
DEPENDS ${txtfile}
|
|
VERBATIM)
|
|
add_custom_command(
|
|
- COMMAND ${XMLTO_EXECUTABLE} man ${xmlfile}
|
|
+ COMMAND ${XMLTO_EXECUTABLE} --skip-validation man ${xmlfile}
|
|
OUTPUT ${manfile}
|
|
WORKING_DIRECTORY ${BUILD_DIR}/${relpath2}
|
|
DEPENDS ${xmlfile})
|
|
@@ -274,14 +274,15 @@ endif()
|
|
|
|
# {{{ Theme icons
|
|
file(GLOB icon_sources RELATIVE ${SOURCE_DIR} ${SOURCE_DIR}/themes/*/titlebar/*.png)
|
|
-set(ALL_ICONS ${icon_sources})
|
|
|
|
foreach(icon ${icon_sources})
|
|
# Copy all icons to the build dir to simplify the following code.
|
|
# Source paths are interpreted relative to ${SOURCE_DIR}, target paths
|
|
# relative to ${BUILD_DIR}.
|
|
get_filename_component(icon_path ${icon} PATH)
|
|
+ get_filename_component(icon_name ${icon} NAME)
|
|
file(COPY ${icon} DESTINATION ${icon_path})
|
|
+ set(ALL_ICONS ${ALL_ICONS} "${icon_path}/${icon_name}")
|
|
endforeach()
|
|
|
|
macro(a_icon_convert match replacement input)
|