Commit 8844bdd5 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix qt6 install plugins

parent 6724df92
Pipeline #155742 passed with stage
in 1 minute and 36 seconds
kcoreaddons_add_plugin(kio_filenamesearch INSTALL_NAMESPACE "kf5/kio")
kcoreaddons_add_plugin(kio_filenamesearch INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kio")
target_link_libraries(kio_filenamesearch KF5::KIOCore KF5::DBusAddons Qt::Network KF5::KIOCore KF5::I18n)
target_sources(kio_filenamesearch PRIVATE kio_filenamesearch.cpp)
......
......@@ -11,4 +11,4 @@ target_link_libraries(filenamesearchmodule
KF5::KIOCore
)
install(TARGETS filenamesearchmodule DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kded)
install(TARGETS filenamesearchmodule DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kded)
......@@ -19,4 +19,4 @@ ecm_qt_declare_logging_category(kio_filter
target_link_libraries(kio_filter KF5::Archive KF5::KIOCore Qt::Network)
install(TARGETS kio_filter DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
install(TARGETS kio_filter DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio)
......@@ -71,6 +71,6 @@ if (MD5SUM_EXECUTABLE)
target_link_libraries(kio_fish ${UTIL_LIBRARIES})
endif ()
install(TARGETS kio_fish DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio )
install(TARGETS kio_fish DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio )
endif ()
......@@ -19,6 +19,6 @@ ecm_qt_declare_logging_category(kio_info
EXPORT KIO_EXTRAS
)
install(TARGETS kio_info DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
install(TARGETS kio_info DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio)
install( FILES kde-info2html.conf DESTINATION ${KDE_INSTALL_DATADIR}/kio_info )
install( PROGRAMS kde-info2html DESTINATION ${KDE_INSTALL_DATADIR}/kio_info )
......@@ -60,4 +60,4 @@ target_link_libraries(kio_man
PRIVATE KF5::KIOCore Qt::Widgets KF5::Archive KF5::I18n KF5::Codecs Qt::Network kio_man_debug
)
install(TARGETS kio_man DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
install(TARGETS kio_man DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio)
......@@ -24,7 +24,7 @@ ecm_qt_declare_logging_category(kio_mtp
EXPORT KIO_EXTRAS
)
install(TARGETS kio_mtp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
install(TARGETS kio_mtp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio)
########### install files ###############
......
......@@ -8,7 +8,7 @@ qt_add_dbus_adaptor(kiod_kmtpd_SRCS ../shared/org.kde.kmtp.daemon.xml kmtpd.h KM
qt_add_dbus_adaptor(kiod_kmtpd_SRCS ../shared/org.kde.kmtp.device.xml mtpdevice.h MTPDevice)
qt_add_dbus_adaptor(kiod_kmtpd_SRCS ../shared/org.kde.kmtp.storage.xml mtpstorage.h MTPStorage)
kcoreaddons_add_plugin(kmtpd INSTALL_NAMESPACE "kf5/kiod" SOURCES ${kiod_kmtpd_SRCS})
kcoreaddons_add_plugin(kmtpd INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kiod" SOURCES ${kiod_kmtpd_SRCS})
target_link_libraries(kmtpd
kmtp
......
......@@ -18,5 +18,5 @@ target_sources(kmtp PRIVATE
kmtpfile.cpp
${kmtp_dbus_SRCS}
)
set_property(TARGET kmtp PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(kmtp Qt::Core Qt::DBus)
......@@ -79,6 +79,6 @@ ecm_qt_declare_logging_category(kio_nfs
EXPORT KIO_EXTRAS
)
install(TARGETS kio_nfs DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
install(TARGETS kio_nfs DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio)
########### install files ###############
......@@ -5,7 +5,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
add_library(kio_recentdocuments MODULE recentdocuments.cpp)
target_link_libraries(kio_recentdocuments KF5::KIOCore KF5::I18n KF5::ConfigCore Qt::DBus Qt::Network)
set_target_properties(kio_recentdocuments PROPERTIES OUTPUT_NAME "recentdocuments")
install(TARGETS kio_recentdocuments DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
install(TARGETS kio_recentdocuments DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio)
########### next target ###############
......@@ -15,6 +15,6 @@ kcoreaddons_desktop_to_json(kded_recentdocumentsnotifier recentdocumentsnotifier
target_link_libraries(kded_recentdocumentsnotifier KF5::KIOCore KF5::DBusAddons)
install(TARGETS kded_recentdocumentsnotifier DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kded )
install(TARGETS kded_recentdocumentsnotifier DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kded )
########### install files ###############
......@@ -3,7 +3,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kio5_recentlyused\")
add_library(recentlyused MODULE)
set_target_properties(recentlyused PROPERTIES
OUTPUT_NAME "recentlyused"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf5/kio"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf${QT_MAJOR_VERSION}/kio"
)
target_sources(recentlyused PRIVATE
recentlyused.cpp
......@@ -35,4 +35,4 @@ target_link_libraries(recentlyused
KF5::Activities
KF5::ActivitiesStats)
install(TARGETS recentlyused DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
install(TARGETS recentlyused DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio)
......@@ -5,7 +5,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
add_library(kio_sftp MODULE)
set_target_properties(kio_sftp PROPERTIES
OUTPUT_NAME "sftp"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf5/kio"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf${QT_MAJOR_VERSION}/kio"
)
target_sources(kio_sftp PRIVATE kio_sftp.cpp)
......@@ -39,4 +39,4 @@ target_link_libraries(kio_sftp
Qt::Network
ssh)
install(TARGETS kio_sftp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
install(TARGETS kio_sftp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio)
......@@ -96,9 +96,9 @@ target_link_libraries(kio_smb
)
set_target_properties(kio_smb PROPERTIES OUTPUT_NAME "smb")
set_target_properties(kio_smb PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf5/kio")
set_target_properties(kio_smb PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kf${QT_MAJOR_VERSION}/kio")
install(TARGETS kio_smb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
install(TARGETS kio_smb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio)
install(FILES smb-network.desktop DESTINATION ${KDE_INSTALL_DATADIR}/konqueror/dirtree/remote)
install(FILES smb-network.desktop DESTINATION ${KDE_INSTALL_DATADIR}/remoteview)
......
......@@ -13,4 +13,4 @@ target_link_libraries(kded-smbwatcher KF5::DBusAddons KF5::KIOCore kio_smb_stati
set_target_properties(kded-smbwatcher PROPERTIES OUTPUT_NAME smbwatcher)
target_link_options(kded-smbwatcher PUBLIC "LINKER:--as-needed") # shrink to bare minimum we load this into kded
kcoreaddons_desktop_to_json(kded-smbwatcher kded_smbwatcher.desktop)
install(TARGETS kded-smbwatcher DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kded)
install(TARGETS kded-smbwatcher DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kded)
......@@ -32,7 +32,7 @@ include(KDECMakeSettings)
include(GenerateExportHeader)
set(REQUIRED_QT_VERSION 5.9.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core Network Xml)
find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Core Network Xml)
find_package(KDSoap 1.9.0 REQUIRED)
set_package_properties(KDSoap PROPERTIES
......@@ -43,7 +43,7 @@ set_package_properties(KDSoap PROPERTIES
)
if (BUILD_TESTING)
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
endif()
include(ECMSetupVersion)
......
......@@ -78,7 +78,7 @@ target_link_libraries(kio_thumbnail
KF5::I18n
)
install(TARGETS kio_thumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
install(TARGETS kio_thumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kio)
########### next target ###############
......@@ -113,7 +113,7 @@ target_link_libraries(jpegthumbnail
)
install(FILES jpegcreatorsettings5.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
install(TARGETS jpegthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS jpegthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
########### next target ###############
......@@ -127,7 +127,7 @@ target_link_libraries(svgthumbnail
KF5::KIOWidgets
)
install(TARGETS svgthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS svgthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
########### next target ###############
......@@ -140,7 +140,7 @@ target_link_libraries(textthumbnail
KF5::SyntaxHighlighting
)
install(TARGETS textthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS textthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
########### next target ###############
......@@ -160,7 +160,7 @@ if(NOT WIN32)
kcoreaddons_desktop_to_json(djvuthumbnail djvuthumbnail.desktop)
target_link_libraries(djvuthumbnail KF5::KIOWidgets)
install(TARGETS djvuthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS djvuthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
endif()
......@@ -195,7 +195,7 @@ if(OpenEXR_FOUND)
# when exceptions are not enabled.
kde_source_files_enable_exceptions(exrcreator.cpp)
install(TARGETS exrthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS exrthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
endif()
......@@ -212,7 +212,7 @@ if(X11_Xcursor_FOUND)
${X11_Xcursor_LIB}
)
install(TARGETS cursorthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS cursorthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
endif()
......@@ -231,11 +231,11 @@ endif()
kcoreaddons_desktop_to_json(windowsexethumbnail windowsexethumbnail.desktop)
target_link_libraries(windowsexethumbnail KF5::KIOWidgets)
install(TARGETS windowsexethumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS windowsexethumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
kcoreaddons_desktop_to_json(windowsimagethumbnail windowsimagethumbnail.desktop)
target_link_libraries(windowsimagethumbnail KF5::KIOWidgets)
install(TARGETS windowsimagethumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS windowsimagethumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
########### next target ###############
......@@ -257,7 +257,7 @@ target_link_libraries(comicbookthumbnail
KF5::KIOWidgets
)
install(TARGETS comicbookthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS comicbookthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
# ########### next target ###############
......@@ -269,7 +269,7 @@ target_link_libraries(kritathumbnail
KF5::Archive
)
install(TARGETS kritathumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS kritathumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
########### next target #################
......@@ -283,7 +283,7 @@ if(Taglib_FOUND)
KF5::KIOWidgets
)
install(TARGETS audiothumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS audiothumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
endif()
......@@ -298,7 +298,7 @@ target_link_libraries(opendocumentthumbnail
KF5::Archive
)
install(TARGETS opendocumentthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/thumbcreator)
install(TARGETS opendocumentthumbnail DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/thumbcreator)
# ########### next target ###############
......
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