From 89b600dbce8e7be9cab043f5f3a1b789fef59aab Mon Sep 17 00:00:00 2001 From: Patrick Spendrin Date: Tue, 26 Nov 2013 17:44:55 +0100 Subject: [PATCH] do not build some tests on Windows, also do not always link against konsoleprivate --- src/tests/CMakeLists.txt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 2fbbabce..7ec71f93 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -8,10 +8,12 @@ set(KONSOLE_TEST_LIBS ${QT_QTTEST_LIBRARY} konsoleprivate) ## If it's interactive, it shouldn't use kde4_add_unit_test, ## since make test is supposed to be fully automated. +if(WIN32) kde4_add_executable(PartManualTest TEST PartManualTest.cpp) target_link_libraries(PartManualTest ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} ${KONSOLE_TEST_LIBS}) +endif() kde4_add_unit_test(CharacterColorTest CharacterColorTest.cpp) target_link_libraries(CharacterColorTest ${KONSOLE_TEST_LIBS}) @@ -21,14 +23,16 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS}) endif() -kde4_add_unit_test(HistoryTest HistoryTest.cpp) -target_link_libraries(HistoryTest ${KONSOLE_TEST_LIBS}) +kde4_add_unit_test(HistoryTest HistoryTest.cpp ../History.cpp) +set_target_properties(HistoryTest PROPERTIES COMPILE_FLAGS -DKONSOLEPRIVATE_EXPORT=) +target_link_libraries(HistoryTest ${QT_QTTEST_LIBRARY}) -kde4_add_unit_test(KeyboardTranslatorTest KeyboardTranslatorTest.cpp) -target_link_libraries(KeyboardTranslatorTest ${KONSOLE_TEST_LIBS}) +kde4_add_unit_test(KeyboardTranslatorTest KeyboardTranslatorTest.cpp ../KeyboardTranslator.cpp) +set_target_properties(KeyboardTranslatorTest PROPERTIES COMPILE_FLAGS -DKONSOLEPRIVATE_EXPORT=) +target_link_libraries(KeyboardTranslatorTest ${QT_QTTEST_LIBRARY}) -if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT WIN32) kde4_add_unit_test(PartTest PartTest.cpp) target_link_libraries(PartTest ${KDE4_KPARTS_LIBS} ${KDE4_KPTY_LIBS} @@ -38,8 +42,10 @@ endif() kde4_add_unit_test(ProfileTest ProfileTest.cpp) target_link_libraries(ProfileTest ${KONSOLE_TEST_LIBS}) +if(NOT WIN32) kde4_add_unit_test(PtyTest PtyTest.cpp) target_link_libraries(PtyTest ${KDE4_KPTY_LIBS} ${KONSOLE_TEST_LIBS}) +endif() kde4_add_unit_test(SessionTest SessionTest.cpp) target_link_libraries(SessionTest ${KONSOLE_TEST_LIBS})