Commit 99ad93ff authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

fix configure against qt6

parent dc4e44ce
......@@ -102,7 +102,7 @@ set_package_properties(Qt5TextToSpeech PROPERTIES DESCRIPTION
"Add support for texttospeed"
TYPE OPTIONAL
)
if(Qt5TextToSpeech_FOUND)
if(Qt${QT_MAJOR_VERSION}TextToSpeech_FOUND)
set(HAVE_TEXT_TO_SPEECH_SUPPORT TRUE)
endif()
find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test DBus NetworkAuth)
......
......@@ -55,7 +55,7 @@ target_link_libraries(akonadi_maildispatcher_agent
install( TARGETS akonadi_maildispatcher_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES maildispatcheragent.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents" )
install( FILES akonadi_maildispatcher_agent.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
install( FILES akonadi_maildispatcher_agent.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR} )
############################## Configuration ##############################
......
......@@ -49,7 +49,7 @@ target_link_libraries( akonadi_newmailnotifier_agent
KF5::KIOGui
)
if(Qt5TextToSpeech_FOUND)
if(Qt${QT_MAJOR_VERSION}TextToSpeech_FOUND)
target_link_libraries( akonadi_newmailnotifier_agent
Qt${QT_MAJOR_VERSION}::TextToSpeech
)
......@@ -68,7 +68,7 @@ install(TARGETS akonadi_newmailnotifier_agent ${KDE_INSTALL_TARGETS_DEFAULT_ARGS
install(FILES newmailnotifieragent.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents")
install(FILES akonadi_newmailnotifier_agent.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
install(FILES akonadi_newmailnotifier_agent.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR} )
########################## Config plugin #################################
......
......@@ -232,4 +232,4 @@ ecm_install_icons(
)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/akonadi_ews_resource.notifyrc
DESTINATION "${KDE_INSTALL_KNOTIFY5RCDIR}")
DESTINATION "${KDE_INSTALL_KNOTIFYRCDIR}")
......@@ -108,5 +108,5 @@ install(
install(
FILES akonadi_google_resource.notifyrc
DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR}
DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR}
)
......@@ -72,7 +72,7 @@ endif()
add_subdirectory( wizard )
install(TARGETS akonadi_pop3_resource ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES akonadi_pop3_resource.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR})
install(FILES akonadi_pop3_resource.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
################################## Config plugin ##############################
......
Supports Markdown
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