Page MenuHomePhorge
Files F16570029

No OneTemporary
Actions

View Options

diff --git a/kdecore/tests/CMakeLists.txt b/kdecore/tests/CMakeLists.txt
index 6455ed7241..a592bfc526 100644
--- a/kdecore/tests/CMakeLists.txt
+++ b/kdecore/tests/CMakeLists.txt
@@ -1,141 +1,148 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${KDE4_KDECORE_INCLUDES} )
remove_definitions(-DQT_NO_CAST_FROM_ASCII)
MACRO(KDECORE_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME "kdecore-${_testname}" NOGUI ${_testname}.cpp)
target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY} kcoreaddons kde4support)
if(WINCE)
target_link_libraries(${_testname} ${WCECOMPAT_LIBRARIES})
endif(WINCE)
ENDFOREACH(_testname)
ENDMACRO(KDECORE_UNIT_TESTS)
MACRO(KDECORE_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_executable(${_testname} NOGUI TEST ${_testname}.cpp)
target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} kcoreaddons kde4support)
if(WINCE)
target_link_libraries(${_testname} ${WCECOMPAT_LIBRARIES})
endif(WINCE)
ENDFOREACH(_testname)
ENDMACRO(KDECORE_EXECUTABLE_TESTS)
########### next target ###############
KDECORE_UNIT_TESTS(
kdirwatch_unittest
klocaletimeformattest
klocalizedstringtest
kmountpointtest
- kstandarddirstest
kurltest
kstringhandlertest
cplusplustest
ksortablelisttest
- kcalendartest
kmacroexpandertest
kshelltest
kasciitest
ktimezonestest
kentrymaptest
- kconfigtest
kurlmimetest
ksharedptrtest
kdatetimetest
ksavefiletest
kdesktopfiletest
kautostarttest
ksycocadicttest
- kservicetest
kglobalstatictest
- kglobaltest
globalcleanuptest
kprocesstest
kconfigafterkglobaltest1
kconfigafterkglobaltest2
ktcpsockettest
ksycocathreadtest
kdebug_unittest
kencodingdetectortest
qcoreapptest
kdebug_qcoreapptest
kmimetype_nomimetypes
)
+if(NOT QT5_BUILD)
+ KDECORE_UNIT_TESTS(
+ kcalendartest
+ kstandarddirstest
+ kservicetest
+ kconfigtest
+ kglobaltest
+ )
+endif()
+
if(NOT KDE_NO_DEPRECATED)
KDECORE_UNIT_TESTS(
klibloadertest
)
endif(NOT KDE_NO_DEPRECATED)
if(UNIX)
KDECORE_UNIT_TESTS(
klocalsockettest
klocalsocketservertest
)
endif(UNIX)
KDECORE_EXECUTABLE_TESTS(
kdirwatchtest
krandomsequencetest
kdebugtest
kcmdlineargstest
kmemtest
dbuscalltest
kmdcodectest
startserviceby
)
########### klocaletest ###############
# compile into the test since it's not exported
set(klocaletest_SRCS klocaletest.cpp ../date/kdayperiod.cpp)
kde4_add_unit_test(klocaletest ${klocaletest_SRCS})
target_link_libraries(klocaletest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
########### kdatetimeformattertest ###############
# compile KDateTimeFormatter and KDayPeriod into the test since it's not exported
set(kdatetimeformattertest_SRCS kdatetimeformattertest.cpp ../date/kdatetimeformatter.cpp ../date/kdayperiod.cpp)
kde4_add_unit_test(kdatetimeformattertest ${kdatetimeformattertest_SRCS})
target_link_libraries(kdatetimeformattertest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
########### kdirwatchtest_gui ###############
kde4_add_executable(kdirwatchtest_gui TEST kdirwatchtest_gui.cpp)
target_link_libraries(kdirwatchtest_gui ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} kcoreaddons)
########### kmimetypetest ###############
-set(kmimetypetest_SRCS kmimetypetest.cpp)
-kde4_add_unit_test(kmimetypetest TESTNAME kdecore-kmimetypetest ${kmimetypetest_SRCS})
-target_link_libraries(kmimetypetest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
+if(NOT QT5_BUILD)
+ set(kmimetypetest_SRCS kmimetypetest.cpp)
+ kde4_add_unit_test(kmimetypetest TESTNAME kdecore-kmimetypetest ${kmimetypetest_SRCS})
+ target_link_libraries(kmimetypetest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kcoreaddons)
+endif()
########### module for klibloadertest ###############
if(NOT KDE_NO_DEPRECATED)
set(klibloadertestmodule_PART_SRCS klibloadertest_module.cpp )
kde4_add_plugin(klibloadertestmodule ${klibloadertestmodule_PART_SRCS})
target_link_libraries(klibloadertestmodule ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
set_target_properties(klibloadertestmodule PROPERTIES SKIP_BUILD_RPATH FALSE BUILD_WITH_INSTALL_RPATH FALSE)
endif(NOT KDE_NO_DEPRECATED)
########### module for klibloadertest4 ###############
if (NOT WIN32) # TODO: reenable for win32
set(klibloadertestmodule4_PART_SRCS klibloadertest4_module.cpp )
kde4_add_plugin(klibloadertestmodule4 ${klibloadertestmodule4_PART_SRCS})
target_link_libraries(klibloadertestmodule4 ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
set_target_properties(klibloadertestmodule4 PROPERTIES SKIP_BUILD_RPATH FALSE BUILD_WITH_INSTALL_RPATH FALSE)
endif (NOT WIN32)
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index 0564f30137..d38c95d030 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -1,159 +1,164 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
add_subdirectory(kconfig_compiler)
include_directories( ${KDE4_KDEUI_INCLUDES} proxymodeltestsuite )
# QtTest needs this in order to include the gui stuff.
# The alternative (which requires Qt>=4.6) is #include <QTestGui>
add_definitions(-DQT_GUI_LIB)
add_definitions(-DQT_WIDGETS_LIB)
MACRO(KDEUI_UNIT_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_unit_test(${_testname} TESTNAME kdeui-${_testname} ${_testname}.cpp)
target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES} kcoreaddons)
ENDFOREACH(_testname)
ENDMACRO(KDEUI_UNIT_TESTS)
MACRO(KDEUI_EXECUTABLE_TESTS)
FOREACH(_testname ${ARGN})
kde4_add_executable(${_testname} TEST ${_testname}.cpp)
target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} ${KDEWIN_LIBRARIES} kcoreaddons)
ENDFOREACH(_testname)
ENDMACRO(KDEUI_EXECUTABLE_TESTS)
KDEUI_UNIT_TESTS(
kactioncollectiontest
kactioncategorytest
kbuttongrouptest
kcompletioncoretest
kconfigguitest
kconfigskeletontest
kdualactiontest
kfadewidgeteffecttest
kfindtest
kglobalsettingstest
kglobalshortcuttest
kmainwindow_unittest
klineedit_unittest
ktextedit_unittest
kcombobox_unittest
kdialog_unittest
kreplacetest
kshortcuttest
kstandardactiontest
kstandardshortcuttest
kuniqueapptest
- kwordwraptest
kapplication_unittest
kcolorutilstest
kxmlgui_unittest
ktimezonewidget_unittest
kiconloader_unittest
ktabwidget_unittest
ktoolbar_unittest
krichtextedittest
kselectaction_unittest
klistwidgetsearchlinetest
ktimecomboboxtest
kdatecomboboxtest
kdatetimeedittest
)
+if(NOT QT5_BUILD)
+ KDEUI_UNIT_TESTS(
+ kwordwraptest
+ )
+endif()
+
KDEUI_EXECUTABLE_TESTS(
kaccelgentest
kactionselectortest
kanimatedbuttontest
kcharselecttest
kapptest
kassistantdialogtest
kbugreporttest
kcategorizedviewtest
kcodecactiontest
kcolorcollectiontest
kcolordlgtest
kcolorcombotest
kcomboboxtest
kcompletionuitest
kdatepicktest
kdatetabletest
kdatetimewidgettest
kdatewidgettest
kdebugtest_gui
kdialogbuttonboxtest
kdialogtest
keditlistwidgettest
kfontdialogtest
kglobalsettingsclient # helper program for kglobalsettingstest
khboxtest
kiconeffecttest
kicondialogtest
kiconloadertest
kinputdialogtest
kjobtrackerstest
kledtest
klineedittest
kmainwindowtest
kmainwindowrestoretest
kmessageboxtest
kmessagetest
kmodifierkeyinfotest
knewpassworddialogtest
kstatusnotifieritemtest
knotificationrestrictionstest
knuminputtest
kpagedialogtest
kpagewidgettest
kpassivepopuptest
kpassworddialogtest
kpixmapregionselectordialogtest
kpopuptest
kprogressdialogtest
krulertest
kselectactiontest
kseparatortest
kstatusbartest
ksqueezedtextlabeltest
ksystemtraytest
ktabwidgettest
ktextedittest
ktextbrowsertest
ktitlewidgettest
ktoolbartest
ktoolbarlabelactiontest
ktreewidgetsearchlinetest
kwallettest
kwidgetitemdelegatetest
kwindowtest
kxmlguitest
kxmlguiwindowtest
testqtargs
kpixmapsequenceoverlaypaintertest
)
if (NOT KDE_NO_DEPRECATED)
KDEUI_EXECUTABLE_TESTS(
keditlistboxtest
)
endif (NOT KDE_NO_DEPRECATED)
if (Q_WS_X11)
KDEUI_EXECUTABLE_TESTS(
fixx11h_test
fixx11h_test2
kmanagerselectiontest
kxerrorhandlertest
)
target_link_libraries(kmanagerselectiontest ${X11_X11_LIB})
target_link_libraries(kxerrorhandlertest ${X11_X11_LIB})
endif (Q_WS_X11)
## kcolorutilsdemo
SET(kcolorUtilsDemoSources kcolorutilsdemo.cpp kimageframe.cpp ../colors/kcolorspaces.cpp)
kde4_add_ui_files(kcolorUtilsDemoSources kcolorutilsdemo.ui)
kde4_add_executable(kcolorutilsdemo ${kcolorUtilsDemoSources})
target_link_libraries(kcolorutilsdemo ${KDE4_KDEUI_LIBS} ${KDEWIN_LIBRARIES} kcoreaddons )

File Metadata

Mime Type
text/x-diff
Expires
Fri, Nov 1, 9:01 AM (1 d, 12 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
10075437
Default Alt Text
(9 KB)

Event Timeline