Commit e8830602 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: Use versionless Qt cmake target. This makes it easier to build against both Qt5 and Qt6

parent 1acf07ce
Pipeline #49176 skipped
......@@ -16,7 +16,7 @@ macro( add_messagecomposer_test _source )
KF5::MessageCore
KF5::TemplateParser
KF5::PimTextEdit
Qt5::Test
Qt::Test
KF5::IdentityManagement
KF5::Contacts
KF5::AkonadiCore
......@@ -41,7 +41,7 @@ macro( add_messagecomposer_cryptotest _source )
KF5::Libkdepim
KF5::PimTextEdit
KF5::AkonadiCore
Qt5::Test
Qt::Test
QGpgme
KF5::IconThemes
KF5::Completion
......
......@@ -3,7 +3,7 @@ add_definitions( -DSIGNATURE_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )
macro(add_composerng_autocorrect_unittest _source)
ecm_add_test(${_source}
NAME_PREFIX "messagecomposer-composerng-"
LINK_LIBRARIES Qt5::Test KF5::MessageComposer KF5::XmlGui
LINK_LIBRARIES Qt::Test KF5::MessageComposer KF5::XmlGui
)
endmacro()
......
macro(add_composer_unittest _source)
ecm_add_test(${_source}
NAME_PREFIX "messagecomposer-composer-"
LINK_LIBRARIES Qt5::Test KF5::MessageComposer
LINK_LIBRARIES Qt::Test KF5::MessageComposer
)
endmacro()
......
ecm_add_test(imagescalingtest.cpp
NAME_PREFIX "messagecomposer-imagescaling-"
LINK_LIBRARIES KF5::Mime KF5::MessageComposer KF5::MessageViewer KF5::MessageCore KF5::TemplateParser
KF5::PimTextEdit Qt5::Test KF5::IdentityManagement KF5::Contacts
KF5::PimTextEdit Qt::Test KF5::IdentityManagement KF5::Contacts
KF5::AkonadiCore
)
macro(add_plugineditor_unittest _source)
ecm_add_test(${_source}
NAME_PREFIX "messagecomposer-plugineditor-"
LINK_LIBRARIES Qt5::Test KF5::MessageComposer KF5::XmlGui
LINK_LIBRARIES Qt::Test KF5::MessageComposer KF5::XmlGui
)
endmacro()
......
macro(add_composer_snippet_unittest _source)
ecm_add_test(${_source}
NAME_PREFIX "messagecomposer-snippet-"
LINK_LIBRARIES Qt5::Test KF5::MessageComposer KF5::Completion
LINK_LIBRARIES Qt::Test KF5::MessageComposer KF5::Completion
)
endmacro()
......
......@@ -2,5 +2,5 @@
set( kmail_statusbarlabeltoggledstate_source statusbarlabeltoggledstatetest.cpp)
add_executable(statusbarlabeltoggledstatetest ${kmail_statusbarlabeltoggledstate_source})
ecm_mark_as_test(kmail-statusbarlabeltoggledstatetest)
target_link_libraries( statusbarlabeltoggledstatetest Qt5::Test KF5::KIOWidgets KF5::I18n KF5::MessageComposer)
target_link_libraries( statusbarlabeltoggledstatetest Qt::Test KF5::KIOWidgets KF5::I18n KF5::MessageComposer)
......@@ -5,7 +5,7 @@ macro(add_messagecore_test _source )
add_definitions(-DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")
ecm_add_test(${_source}
NAME_PREFIX "messagecore-"
LINK_LIBRARIES Qt5::Test KF5::Libkleo KF5::MessageCore Qt5::Widgets KF5::Archive KF5::Completion KF5::ConfigCore KF5::CoreAddons
LINK_LIBRARIES Qt::Test KF5::Libkleo KF5::MessageCore Qt::Widgets KF5::Archive KF5::Completion KF5::ConfigCore KF5::CoreAddons
)
endmacro()
......
......@@ -72,7 +72,7 @@ target_link_libraries(KF5MessageCore
KF5::PimTextEdit
KF5::Archive
KF5::ConfigWidgets
Qt5::Network
Qt::Network
KF5::I18n
KF5::IdentityManagement
KF5::PimCommon
......
......@@ -4,7 +4,7 @@ macro(messagelist_unittest _source)
ecm_add_test(${_source}
TEST_NAME ${_name}
NAME_PREFIX "messagelist-"
LINK_LIBRARIES Qt5::Test KF5::MessageCore KF5::MessageList KF5::PimCommon
LINK_LIBRARIES Qt::Test KF5::MessageCore KF5::MessageList KF5::PimCommon
)
endmacro ()
......
......@@ -11,7 +11,7 @@ macro(add_messageviewer_unittest _source)
ecm_add_test(${_source} setupenv.cpp util.cpp
TEST_NAME ${_name}
NAME_PREFIX "messageviewer-"
LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo QGpgme Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::CalendarCore KF5::WebEngineViewer
LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo QGpgme Qt::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::CalendarCore KF5::WebEngineViewer
)
endmacro ()
......@@ -20,7 +20,7 @@ macro(add_messageviewer_class_unittest _source _additionalSource)
ecm_add_test(${_source} ${_additionalSource}
TEST_NAME ${_name}
NAME_PREFIX "messageviewer-"
LINK_LIBRARIES KF5::MessageViewer Qt5::Test KF5::IconThemes KF5::XmlGui KF5::I18n
LINK_LIBRARIES KF5::MessageViewer Qt::Test KF5::IconThemes KF5::XmlGui KF5::I18n
)
endmacro ()
......@@ -32,7 +32,7 @@ macro(add_messageviewer_mailsourceviewbrowserwidget_unittest _source)
ecm_add_test(${_source} ../src/widgets/mailsourceviewtextbrowserwidget.cpp ../src/findbar/findbarsourceview.cpp ${test_libmessageviewer_SRCS}
TEST_NAME ${_name}
NAME_PREFIX "messageviewer-"
LINK_LIBRARIES Qt5::Test Qt5::Gui Qt5::Widgets KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::CalendarCore KF5::PimTextEdit KF5::PimCommon KF5::MessageViewer KF5::WebEngineViewer KF5::SyntaxHighlighting KF5::I18n KF5::IconThemes
LINK_LIBRARIES Qt::Test Qt::Gui Qt::Widgets KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::CalendarCore KF5::PimTextEdit KF5::PimCommon KF5::MessageViewer KF5::WebEngineViewer KF5::SyntaxHighlighting KF5::I18n KF5::IconThemes
)
endmacro ()
......
......@@ -342,7 +342,7 @@ target_link_libraries(KF5MessageViewer
PRIVATE
KF5::SyntaxHighlighting
KF5::ItemViews
Qt5::Network
Qt::Network
KF5::WebEngineViewer
KF5::GrantleeTheme
KF5::MailTransportAkonadi
......@@ -358,7 +358,7 @@ target_link_libraries(KF5MessageViewer
KF5::XmlGui
KF5::AkonadiContact
Grantlee5::Templates
Qt5::PrintSupport
Qt::PrintSupport
QGpgme
${Inotify_LIBRARIES}
${OPTIONAL_PRIVATE}
......
......@@ -4,7 +4,7 @@ macro(add_messageviewer_dkim_verify_unittest _source)
ecm_add_test(${_source}
TEST_NAME ${_name}
NAME_PREFIX "messageviewer-"
LINK_LIBRARIES KF5::MessageViewer KF5::WebEngineViewer KF5::Libkleo QGpgme Qt5::Test qca-qt5 KF5::ItemViews
LINK_LIBRARIES KF5::MessageViewer KF5::WebEngineViewer KF5::Libkleo QGpgme Qt::Test qca-qt5 KF5::ItemViews
)
endmacro ()
......
set(dkimtest_lookupkey_SRCS main.cpp lookupkey.cpp)
add_executable(dkimtest_lookupkey ${dkimtest_lookupkey_SRCS})
target_link_libraries(dkimtest_lookupkey
Qt5::Network
Qt::Network
)
set(dkimtest_checkrsapublickey_SRCS checkrsapublickey.cpp)
add_executable(dkimtest_checkrsapublickey ${dkimtest_checkrsapublickey_SRCS})
target_link_libraries(dkimtest_checkrsapublickey
Qt5::Network
Qt::Network
qca-qt5
)
set(dkimtest_checksignature_SRCS checksignature.cpp)
add_executable(dkimtest_checksignature ${dkimtest_checksignature_SRCS})
target_link_libraries(dkimtest_checksignature
Qt5::Network
Qt::Network
KF5::MessageViewer
qca-qt5
)
......@@ -23,7 +23,7 @@ target_link_libraries(dkimtest_checksignature
set(dkimtest_dmarclookupkey_SRCS dmarclookupkey.cpp)
add_executable(dkimtest_dmarclookupkey ${dkimtest_dmarclookupkey_SRCS})
target_link_libraries(dkimtest_dmarclookupkey
Qt5::Network
Qt::Network
KF5::MessageViewer
qca-qt5
)
......@@ -10,7 +10,7 @@ ecm_add_test(grantleeheaderstyletest.cpp
KF5::IconThemes
KF5::MessageViewer
KF5::Mime
Qt5::Test
Qt::Test
)
ecm_add_test(grantleeheaderformattertest.cpp
......@@ -22,7 +22,7 @@ ecm_add_test(grantleeheaderformattertest.cpp
KF5::IconThemes
KF5::MessageViewer
KF5::Mime
Qt5::Test
Qt::Test
)
set_tests_properties(
......
ecm_add_test(webengineembedparttest.cpp ../webengineembedpart.cpp
TEST_NAME webengineembedparttest
NAME_PREFIX "messageviewer-webengine-"
LINK_LIBRARIES Qt5::Test Qt5::Core
LINK_LIBRARIES Qt::Test Qt::Core
)
......@@ -10,7 +10,7 @@ macro(add_messageviewer_crypto_unittest _source)
ecm_mark_as_test(messageviewer-messageparttheme-${_name})
target_link_libraries( ${_name}
KF5::MessageViewer
Qt5::Test
Qt::Test
KF5::IconThemes
KF5::Mime
KF5::GrantleeTheme
......@@ -25,17 +25,17 @@ add_messageviewer_crypto_unittest(unencryptedmessagetest.cpp)
ecm_add_test(quotehtmltest.cpp setupenv.cpp ../plugins/quotehtml.cpp
TEST_NAME quotehtmltest
NAME_PREFIX "messageviewer-messageparttheme-"
LINK_LIBRARIES Qt5::Test KF5::MessageViewer KF5::IconThemes KF5::Mime
LINK_LIBRARIES Qt::Test KF5::MessageViewer KF5::IconThemes KF5::Mime
)
ecm_add_test(showonlymimeparttest.cpp setupenv.cpp util.cpp testcsshelper.cpp
TEST_NAME showonlymimeparttest
NAME_PREFIX "messageviewer-messageparttheme-"
LINK_LIBRARIES Qt5::Test KF5::MessageViewer KF5::IconThemes KF5::Mime KF5::GrantleeTheme
LINK_LIBRARIES Qt::Test KF5::MessageViewer KF5::IconThemes KF5::Mime KF5::GrantleeTheme
)
ecm_add_test(converthtmltoplaintexttest.cpp ../converthtmltoplaintext.cpp
TEST_NAME converthtmltoplaintexttest
NAME_PREFIX "messageviewer-messageparttheme-"
LINK_LIBRARIES Qt5::Test KF5::PimTextEdit Qt5::Gui
LINK_LIBRARIES Qt::Test KF5::PimTextEdit Qt::Gui
)
......@@ -3,7 +3,7 @@ macro(add_messageviewer_remote_contents_unittest _source)
ecm_add_test(${_source}
TEST_NAME ${_name}
NAME_PREFIX "messageviewer-"
LINK_LIBRARIES KF5::MessageViewer KF5::WebEngineViewer KF5::Libkleo QGpgme Qt5::Test qca-qt5 KF5::ItemViews
LINK_LIBRARIES KF5::MessageViewer KF5::WebEngineViewer KF5::Libkleo QGpgme Qt::Test qca-qt5 KF5::ItemViews
)
endmacro ()
......
ecm_add_test(scamattributetest.cpp ../scamattribute.cpp
TEST_NAME scamattributetest
NAME_PREFIX "messageviewer-scamdetection-"
LINK_LIBRARIES Qt5::Test KF5::AkonadiCore
LINK_LIBRARIES Qt::Test KF5::AkonadiCore
)
ecm_add_test(scamdetectionwebenginetest.cpp
TEST_NAME scamdetectionwebenginetest
NAME_PREFIX "messageviewer-scamwebenginedetection-"
LINK_LIBRARIES KF5::MessageViewer Qt5::Test Qt5::WebEngine Qt5::WebEngineWidgets
LINK_LIBRARIES KF5::MessageViewer Qt::Test Qt::WebEngine Qt::WebEngineWidgets
)
......@@ -9,8 +9,8 @@ add_executable(scamdetectionwebengine_gui ${scamdetectionwebengine_gui_SRCS})
target_link_libraries(scamdetectionwebengine_gui
KF5::KIOCore
KF5::MessageViewer
Qt5::WebEngine
Qt5::WebEngineWidgets
Qt::WebEngine
Qt::WebEngineWidgets
KF5::I18n
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment