diff --git a/akonadi/kmime/tests/CMakeLists.txt b/akonadi/kmime/tests/CMakeLists.txt index 06c85a1a2..8741b4c09 100644 --- a/akonadi/kmime/tests/CMakeLists.txt +++ b/akonadi/kmime/tests/CMakeLists.txt @@ -1,55 +1,55 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) # TODO apparently QTEST_AKONADIMAIN doesn't like NO_CASTs... remove_definitions( -DQT_NO_CAST_FROM_ASCII ) remove_definitions( -DQT_NO_CAST_TO_ASCII ) set( requester_srcs foldersrequester.cpp ) kde4_add_executable( requester TEST ${requester_srcs} ) -target_link_libraries( requester akonadi-kmime ) +target_link_librarieS( requester akonadi-kmime ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) # for racetest set( requester_exe "QLatin1String( \"${CMAKE_CURRENT_BINARY_DIR}/requester\" )" ) add_definitions( -DREQUESTER_EXE='${requester_exe}' ) macro(add_akonadi_isolated_test _source) get_filename_component(_targetName ${_source} NAME_WE) set(_srcList ${_source} ) kde4_add_executable(${_targetName} TEST ${_srcList}) target_link_libraries(${_targetName} ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_AKONADI_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_MAILTRANSPORT_LIBS} ${KDE4_KMIME_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} akonadi-kmime ) # based on kde4_add_unit_test if (WIN32) get_target_property( _loc ${_targetName} LOCATION ) set(_executable ${_loc}.bat) else (WIN32) set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_targetName}) endif (WIN32) if (UNIX) set(_executable ${_executable}.shell) endif (UNIX) find_program(_testrunner akonaditest) add_test( akonadikmime-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config.xml ${_executable} ) endmacro(add_akonadi_isolated_test) add_akonadi_isolated_test( customfoldertest.cpp ) add_akonadi_isolated_test( racetest.cpp ) diff --git a/mailtransport/CMakeLists.txt b/mailtransport/CMakeLists.txt index 1d6aba546..62d7abd95 100644 --- a/mailtransport/CMakeLists.txt +++ b/mailtransport/CMakeLists.txt @@ -1,77 +1,81 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) +include_directories( + ${Boost_INCLUDE_DIR} +) + add_subdirectory( kconf_update ) add_subdirectory( tests ) add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5324 ) set(mailtransport_lib_srcs transport.cpp transportmanager.cpp transporttype.cpp transportcombobox.cpp transportlistview.cpp transportmanagementwidget.cpp addtransportdialog.cpp transportconfigdialog.cpp transportconfigwidget.cpp sendmailconfigwidget.cpp smtpconfigwidget.cpp transportjob.cpp akonadijob.cpp sendmailjob.cpp smtpjob.cpp precommandjob.cpp legacydecrypt.cpp socket.cpp servertest.cpp ) kde4_add_ui_files(mailtransport_lib_srcs sendmailsettings.ui smtpsettings.ui addtransportdialog.ui transportmanagementwidget.ui ) kde4_add_kcfg_files(mailtransport_lib_srcs transportbase.kcfgc) kde4_add_library(mailtransport SHARED ${mailtransport_lib_srcs}) target_link_libraries(mailtransport ${KDE4_KIO_LIBS} akonadi-kde akonadi-kmime kmime ) set_target_properties(mailtransport PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS mailtransport EXPORT kdepimlibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES mailtransport.kcfg DESTINATION ${KCFG_INSTALL_DIR}) set(mailtransport_kcm_srcs configmodule.cpp) kde4_add_plugin(kcm_mailtransport ${mailtransport_kcm_srcs}) target_link_libraries(kcm_mailtransport ${KDE4_KDEUI_LIBS} mailtransport) install(TARGETS kcm_mailtransport DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES kcm_mailtransport.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install( FILES mailtransport_export.h transportjob.h akonadijob.h sendmailjob.h smtpjob.h ${CMAKE_CURRENT_BINARY_DIR}/transportbase.h transport.h transportmanager.h transporttype.h servertest.h transportcombobox.h transportconfigdialog.h transportmanagementwidget.h DESTINATION ${INCLUDE_INSTALL_DIR}/mailtransport COMPONENT Devel) diff --git a/outboxinterface/CMakeLists.txt b/outboxinterface/CMakeLists.txt index ae1eb123f..7702a951e 100644 --- a/outboxinterface/CMakeLists.txt +++ b/outboxinterface/CMakeLists.txt @@ -1,38 +1,42 @@ add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5324 ) +include_directories( + ${Boost_INCLUDE_DIR} +) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" ) add_subdirectory( tests ) set( outboxinterface_lib_srcs dispatcherinterface.cpp messagequeuejob.cpp outboxactions.cpp dispatchmodeattribute.cpp errorattribute.cpp sentbehaviourattribute.cpp transportattribute.cpp attributeregistrar.cpp ) kde4_add_library( outboxinterface SHARED ${outboxinterface_lib_srcs} ) target_link_libraries( outboxinterface ${KDE4_KIO_LIBS} akonadi-kde akonadi-kmime kmime mailtransport ) set_target_properties( outboxinterface PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) install( TARGETS outboxinterface ${INSTALL_TARGETS_DEFAULT_ARGS} ) install( FILES outboxinterface_export.h dispatcherinterface.h messagequeuejob.h outboxactions.h dispatchmodeattribute.h errorattribute.h sentbehaviourattribute.h transportattribute.h DESTINATION ${INCLUDE_INSTALL_DIR}/outboxinterface COMPONENT Devel ) diff --git a/outboxinterface/tests/CMakeLists.txt b/outboxinterface/tests/CMakeLists.txt index 963f43a60..df36baa42 100644 --- a/outboxinterface/tests/CMakeLists.txt +++ b/outboxinterface/tests/CMakeLists.txt @@ -1,62 +1,60 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) set(queuer_srcs queuer.cpp) kde4_add_executable(queuer TEST ${queuer_srcs}) target_link_libraries(queuer ${KDE4_KDEUI_LIBS} ${KDE4_MAILTRANSPORT_LIBS} ${KDE4_KMIME_LIBS} outboxinterface) - set( sendqueued_srcs sendqueued.cpp ) kde4_add_executable( sendqueued TEST ${sendqueued_srcs} ) -target_link_libraries( sendqueued outboxinterface ) +target_link_libraries( sendqueued outboxinterface ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) set( clearerror_srcs clearerror.cpp ) kde4_add_executable( clearerror TEST ${clearerror_srcs} ) -target_link_libraries( clearerror outboxinterface ) +target_link_libraries( clearerror outboxinterface ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) set( abort_srcs abort.cpp ) kde4_add_executable( abort TEST ${abort_srcs} ) -target_link_libraries( abort outboxinterface ) - +target_link_libraries( abort outboxinterface ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) # Stolen from kdepimlibs/akonadi/tests macro(add_akonadi_isolated_test _source) get_filename_component(_targetName ${_source} NAME_WE) set(_srcList ${_source} ) kde4_add_executable(${_targetName} TEST ${_srcList}) target_link_libraries(${_targetName} ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_AKONADI_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_MAILTRANSPORT_LIBS} ${KDE4_KMIME_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} outboxinterface ) # based on kde4_add_unit_test if (WIN32) get_target_property( _loc ${_targetName} LOCATION ) set(_executable ${_loc}.bat) else (WIN32) set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_targetName}) endif (WIN32) if (UNIX) set(_executable ${_executable}.shell) endif (UNIX) find_program(_testrunner akonaditest) add_test( outboxinterface-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config.xml ${_executable} ) endmacro(add_akonadi_isolated_test) add_akonadi_isolated_test( attributetest.cpp ) add_akonadi_isolated_test( messagequeuejobtest.cpp )