diff options
| author | Emanoil Kotsev <deloptes@gmail.com> | 2016-05-29 02:31:06 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-22 15:56:45 +0200 |
| commit | 787be02d8623d61291d1778aff87c122142f1448 (patch) | |
| tree | 1449071179b3898049ceb724b57ba20fbcd3aef8 /kabc/vcardparser/CMakeLists.txt | |
| parent | 2deafc497132f3e413ef0fa64c656e0ce9b9a8a7 (diff) | |
| download | tdelibs-787be02d8623d61291d1778aff87c122142f1448.tar.gz tdelibs-787be02d8623d61291d1778aff87c122142f1448.zip | |
Fix utf8 support in tdeabc vCard parser
This resolves bug 2625
Signed-off-by: Emanoil Kotsev <deloptes@gmail.com>
(cherry picked from commit 4ceb2b158b3ed1ba1c78ab886b08a0bf40577d51)
Diffstat (limited to 'kabc/vcardparser/CMakeLists.txt')
| -rw-r--r-- | kabc/vcardparser/CMakeLists.txt | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/kabc/vcardparser/CMakeLists.txt b/kabc/vcardparser/CMakeLists.txt index e68bd8fb1..f80b6aa87 100644 --- a/kabc/vcardparser/CMakeLists.txt +++ b/kabc/vcardparser/CMakeLists.txt @@ -11,14 +11,32 @@ include_directories( ${TQT_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/kdecore ${CMAKE_SOURCE_DIR}/kdecore + ${CMAKE_BINARY_DIR}/kabc + ${CMAKE_SOURCE_DIR}/kabc + ${CMAKE_SOURCE_DIR}/kabc/vcard/include + ${CMAKE_SOURCE_DIR}/kabc/vcard/include/generated + ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_SOURCE_DIR}/dcop ) link_directories( ${TQT_LIBRARY_DIRS} ) +set( TDEABC_TESTS_LINK + ${TQT_LIBRARIES} + DCOP-shared + kdecore-shared + kdeui-shared + kdefx-shared + kio-shared + ktexteditor-shared + kabc-shared +) ##### headers ################################### @@ -38,3 +56,63 @@ set( ${target}_SRCS tde_add_library( ${target} STATIC_PIC SOURCES ${${target}_SRCS} ) + + +##### test programs ############################## + +tde_add_executable( testread + SOURCES testread.cpp AUTOMOC + LINK ${TDEABC_TESTS_LINK} +) + +tde_add_executable( testread2 + SOURCES testread2.cpp testutils.cpp AUTOMOC + LINK ${TDEABC_TESTS_LINK} +) + +tde_add_executable( testwrite + SOURCES testwrite.cpp AUTOMOC + LINK ${TDEABC_TESTS_LINK} +) + +tde_add_executable( testwrite2 + SOURCES testwrite2.cpp AUTOMOC + LINK ${TDEABC_TESTS_LINK} +) + +tde_add_executable( testvcardformat + SOURCES testvcardformat.cpp AUTOMOC + LINK ${TDEABC_TESTS_LINK} +) + +tde_add_executable( testvcardformatimpl + SOURCES testvcardformatimpl.cpp AUTOMOC + LINK ${TDEABC_TESTS_LINK} +) + +add_custom_target(testing ALL + COMMAND echo "creating test infrastructure" + DEPENDS testread + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +) + +add_custom_command( + TARGET testing PRE_BUILD + COMMAND test + ARGS -f ${CMAKE_CURRENT_BINARY_DIR}/test.sh || ln -s ${CMAKE_SOURCE_DIR}/kabc/vcardparser/test.sh ${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +) + +add_custom_command( + TARGET testing PRE_BUILD + COMMAND test + ARGS -f ${CMAKE_CURRENT_BINARY_DIR}/checkvcard.pl || ln -s ${CMAKE_SOURCE_DIR}/kabc/vcardparser/checkvcard.pl ${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +) + +add_custom_command( + TARGET testing PRE_BUILD + COMMAND test + ARGS -d ${CMAKE_CURRENT_BINARY_DIR}/tests || ln -s ${CMAKE_SOURCE_DIR}/kabc/vcardparser/tests ${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +) |