From 4f91be7dd592976990087f5c32e6b8a16dc5f8ff Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Fri, 6 Jan 2012 22:32:50 -0500 Subject: [PATCH] Revert "Generate LineFont.h from LineFont.src" This reverts commit 7ead97bfb274fc70dfc48a9606a390761b401c67. It is not going to be worth the trouble to build this small, non- changing file on every OS. I'll fix it so it can be build if the LineFont.src is changed. --- src/CMakeLists.txt | 18 +++++++----------- src/LineFont.h | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 src/LineFont.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 98a10041..204fb122 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,3 @@ -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - find_package(LibKonq) macro_log_feature(LIBKONQ_FOUND "LibKonq" "libkonq is a construction kit for a file manager. It comes from kde-baseapps." "http://www.kde.org" TRUE) @@ -41,17 +39,15 @@ ${CMAKE_CURRENT_BINARY_DIR}/tests/CTestCustom.cmake) target_link_libraries(fontembedder ${KDE4_KIO_LIBS} ) ### Line graphics font - SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/LineFont.h PROPERTIES GENERATED 1) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/LineFont.h - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/fontembedder - ${CMAKE_SOURCE_DIR}/src/LineFont.src - > ${CMAKE_CURRENT_BINARY_DIR}/LineFont.h - DEPENDS ${CMAKE_SOURCE_DIR}/src/LineFont.src) + option(KONSOLE_GENERATE_LINEFONT "Konsole: regenerate LineFont file" OFF) - ADD_CUSTOM_TARGET(generate_linefont - ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/LineFont.h") + if(KONSOLE_GENERATE_LINEFONT) + add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/LineFont.h + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/fontembedder + ARGS ${CMAKE_SOURCE_DIR}/LineFont.src + DEPENDS ${CMAKE_SOURCE_DIR}/LineFont.src ) + endif(KONSOLE_GENERATE_LINEFONT) ### Konsole source files shared between embedded terminal and main application # qdbuscpp2xml -m Session.h -o org.kde.konsole.Session.xml diff --git a/src/LineFont.h b/src/LineFont.h new file mode 100644 index 00000000..116fed5b --- /dev/null +++ b/src/LineFont.h @@ -0,0 +1,21 @@ +// WARNING: Autogenerated by "fontembedder ./linefont.src". +// You probably do not want to hand-edit this! + +static const quint32 LineChars[] = { + 0x00007c00, 0x000fffe0, 0x00421084, 0x00e739ce, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00427000, 0x004e7380, 0x00e77800, 0x00ef7bc0, + 0x00421c00, 0x00439ce0, 0x00e73c00, 0x00e7bde0, 0x00007084, 0x000e7384, 0x000079ce, 0x000f7bce, + 0x00001c84, 0x00039ce4, 0x00003dce, 0x0007bdee, 0x00427084, 0x004e7384, 0x004279ce, 0x00e77884, + 0x00e779ce, 0x004f7bce, 0x00ef7bc4, 0x00ef7bce, 0x00421c84, 0x00439ce4, 0x00423dce, 0x00e73c84, + 0x00e73dce, 0x0047bdee, 0x00e7bde4, 0x00e7bdee, 0x00427c00, 0x0043fce0, 0x004e7f80, 0x004fffe0, + 0x004fffe0, 0x00e7fde0, 0x006f7fc0, 0x00efffe0, 0x00007c84, 0x0003fce4, 0x000e7f84, 0x000fffe4, + 0x00007dce, 0x0007fdee, 0x000f7fce, 0x000fffee, 0x00427c84, 0x0043fce4, 0x004e7f84, 0x004fffe4, + 0x00427dce, 0x00e77c84, 0x00e77dce, 0x0047fdee, 0x004e7fce, 0x00e7fde4, 0x00ef7f84, 0x004fffee, + 0x00efffe4, 0x00e7fdee, 0x00ef7fce, 0x00efffee, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x000f83e0, 0x00a5294a, 0x004e1380, 0x00a57800, 0x00ad0bc0, 0x004390e0, 0x00a53c00, 0x00a5a1e0, + 0x000e1384, 0x0000794a, 0x000f0b4a, 0x000390e4, 0x00003d4a, 0x0007a16a, 0x004e1384, 0x00a5694a, + 0x00ad2b4a, 0x004390e4, 0x00a52d4a, 0x00a5a16a, 0x004f83e0, 0x00a57c00, 0x00ad83e0, 0x000f83e4, + 0x00007d4a, 0x000f836a, 0x004f93e4, 0x00a57d4a, 0x00ad836a, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001c00, 0x00001084, 0x00007000, 0x00421000, + 0x00039ce0, 0x000039ce, 0x000e7380, 0x00e73800, 0x000e7f80, 0x00e73884, 0x0003fce0, 0x004239ce +};