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

wilder
Laurent Montel 5 years ago
parent 5f54249bae
commit 8e9ce094f6
  1. 2
      src/CMakeLists.txt
  2. 2
      src/collectionpage/autotests/CMakeLists.txt
  3. 2
      src/filter/autotests/CMakeLists.txt
  4. 40
      src/filter/tests/CMakeLists.txt
  5. 2
      src/mdn/autotests/CMakeLists.txt
  6. 2
      src/search/autotests/CMakeLists.txt
  7. 14
      src/snippets/autotests/CMakeLists.txt

@ -267,7 +267,7 @@ PRIVATE
KF5::ItemViews
KF5::SyntaxHighlighting
KF5::GuiAddons
Qt5::Xml
Qt::Xml
)

@ -2,7 +2,7 @@ macro(add_mailcommon_collectionpage_test _name)
ecm_add_test(${ARGN}
TEST_NAME ${_name}
NAME_PREFIX "mailcommon-collectionpage-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::MailCommon KF5::Completion
LINK_LIBRARIES Qt::Test Qt::Gui KF5::AkonadiCore KF5::MailCommon KF5::Completion
)
endmacro()

@ -1,4 +1,4 @@
set(mailcommon_filter_test_LIBS Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::AkonadiMime
set(mailcommon_filter_test_LIBS Qt::Test Qt::Gui KF5::AkonadiCore KF5::AkonadiMime
KF5::MailCommon KF5::PimCommon Phonon::phonon4qt5
KF5::KIOWidgets KF5::IconThemes KF5::TemplateParser
KF5::MailTransport KF5::I18n KF5::SyntaxHighlighting

@ -3,8 +3,8 @@ set(filterimporterexportergui_SRCS filterimporterexportergui.cpp)
add_executable(filterimporterexportergui ${filterimporterexportergui_SRCS})
ecm_mark_as_test(filterimporterexportergui)
target_link_libraries(filterimporterexportergui
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
KF5::MailCommon
KF5::I18n
)
@ -13,8 +13,8 @@ set(invalidfilterdialoggui_SRCS invalidfilterdialoggui.cpp)
add_executable(invalidfilterdialoggui ${invalidfilterdialoggui_SRCS})
ecm_mark_as_test(invalidfilterdialoggui)
target_link_libraries(invalidfilterdialoggui
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
KF5::MailCommon
KF5::I18n
)
@ -23,8 +23,8 @@ set(mndadvicedialoggui_SRCS mndadvicedialoggui.cpp)
add_executable(mndadvicedialoggui ${mndadvicedialoggui_SRCS})
ecm_mark_as_test(mndadvicedialoggui)
target_link_libraries(mndadvicedialoggui
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
KF5::MailCommon
KF5::I18n
)
@ -34,8 +34,8 @@ set(kmfilterdialogtestgui_SRCS kmfilterdialogtestgui.cpp ../../../autotests/dumm
add_executable(kmfilterdialogtestgui ${kmfilterdialogtestgui_SRCS})
ecm_mark_as_test(kmfilterdialogtestgui)
target_link_libraries(kmfilterdialogtestgui
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
KF5::MailCommon
KF5::I18n
)
@ -44,8 +44,8 @@ set(filteractionmissingsoundurldialogui_SRCS filteractionmissingsoundurldialogui
add_executable(filteractionmissingsoundurldialogui ${filteractionmissingsoundurldialogui_SRCS})
ecm_mark_as_test(filteractionmissingsoundurldialogui)
target_link_libraries(filteractionmissingsoundurldialogui
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
KF5::MailCommon
KF5::I18n
KF5::KIOWidgets
@ -55,8 +55,8 @@ set(filteractionmissingtemplatedialoggui_SRCS filteractionmissingtemplatedialogg
add_executable(filteractionmissingtemplatedialoggui ${filteractionmissingtemplatedialoggui_SRCS})
ecm_mark_as_test(filteractionmissingtemplatedialoggui)
target_link_libraries(filteractionmissingtemplatedialoggui
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
KF5::MailCommon
KF5::I18n
KF5::Completion
@ -66,8 +66,8 @@ set(filteractionmissingtransportdialoggui_SRCS filteractionmissingtransportdialo
add_executable(filteractionmissingtransportdialoggui ${filteractionmissingtransportdialoggui_SRCS})
ecm_mark_as_test(filteractionmissingtransportdialoggui)
target_link_libraries(filteractionmissingtransportdialoggui
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
KF5::MailCommon
KF5::I18n
KF5::Completion
@ -78,8 +78,8 @@ set(filteractionmissingaccountdialoggui_SRCS filteractionmissingaccountdialoggui
add_executable(filteractionmissingaccountdialoggui ${filteractionmissingaccountdialoggui_SRCS})
ecm_mark_as_test(filteractionmissingaccountdialoggui)
target_link_libraries(filteractionmissingaccountdialoggui
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
KF5::MailCommon
KF5::I18n
KF5::Completion
@ -89,8 +89,8 @@ set(filteractionmissingtagdialoggui_SRCS filteractionmissingtagdialoggui.cpp ../
add_executable(filteractionmissingtagdialoggui ${filteractionmissingtagdialoggui_SRCS})
ecm_mark_as_test(filteractionmissingtagdialoggui)
target_link_libraries(filteractionmissingtagdialoggui
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
KF5::MailCommon
KF5::I18n
KF5::Completion
@ -100,8 +100,8 @@ set(filteractionmissingidentitydialoggui_SRCS filteractionmissingidentitydialogg
add_executable(filteractionmissingidentitydialoggui ${filteractionmissingidentitydialoggui_SRCS})
ecm_mark_as_test(filteractionmissingidentitydialoggui)
target_link_libraries(filteractionmissingidentitydialoggui
Qt5::Core
Qt5::Gui
Qt::Core
Qt::Gui
KF5::MailCommon
KF5::I18n
KF5::Completion

@ -1,5 +1,5 @@
ecm_add_test(mdnstateattributetest.cpp
TEST_NAME mdnattributetest
NAME_PREFIX "mailcommon-mdn-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::MailCommon
LINK_LIBRARIES Qt::Test Qt::Gui KF5::AkonadiCore KF5::MailCommon
)

@ -2,7 +2,7 @@ macro(add_search_autotest _name)
ecm_add_test(${ARGN}
TEST_NAME ${_name}
NAME_PREFIX "mailcommon-search-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::Mime KF5::AkonadiCore KF5::AkonadiMime KF5::MailCommon KF5::I18n
LINK_LIBRARIES Qt::Test Qt::Gui KF5::Mime KF5::AkonadiCore KF5::AkonadiMime KF5::MailCommon KF5::I18n
)
endmacro()

@ -1,34 +1,34 @@
ecm_add_test(snippetsmanagertest.cpp
NAME_PREFIX "mailcommon-snippets-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon KF5::XmlGui
LINK_LIBRARIES Qt::Test Qt::Gui KF5::MailCommon KF5::XmlGui
)
ecm_add_test(snippetwidgettest.cpp
NAME_PREFIX "mailcommon-snippets-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon KF5::XmlGui
LINK_LIBRARIES Qt::Test Qt::Gui KF5::MailCommon KF5::XmlGui
)
ecm_add_test(snippetattachmentwidgettest.cpp
NAME_PREFIX "mailcommon-snippets-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon
LINK_LIBRARIES Qt::Test Qt::Gui KF5::MailCommon
)
ecm_add_test(snippetselectattachmentwidgettest.cpp
NAME_PREFIX "mailcommon-snippets-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon
LINK_LIBRARIES Qt::Test Qt::Gui KF5::MailCommon
)
ecm_add_test(snippetselectattachmentdialogtest.cpp
NAME_PREFIX "mailcommon-snippets-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon
LINK_LIBRARIES Qt::Test Qt::Gui KF5::MailCommon
)
ecm_add_test(snippetcustomfileattachmentnamedialogtest.cpp
NAME_PREFIX "mailcommon-snippets-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon
LINK_LIBRARIES Qt::Test Qt::Gui KF5::MailCommon
)
ecm_add_test(snippetcustomfileattachmentnamewidgettest.cpp
NAME_PREFIX "mailcommon-snippets-"
LINK_LIBRARIES Qt5::Test Qt5::Gui KF5::MailCommon
LINK_LIBRARIES Qt::Test Qt::Gui KF5::MailCommon
)

Loading…
Cancel
Save