GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 11:35:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[kde] Enable KF6 builds.

Browse Source 
With the previous minor changes, the KF6 build seems to be working
exactly like the KF5 build in KDE Neon.
This commit is contained in:
David Korth 2023-08-04 22:41:57 -04:00
parent c5e5fe1fea
commit e405aed196
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -167,6 +167,9 @@ ENDIF(BUILD_KDE4)
IF(BUILD_KF5)
SET(UI_FRONTENDS "${UI_FRONTENDS} KF5")
ENDIF(BUILD_KF5)
IF(BUILD_KF6)
SET(UI_FRONTENDS "${UI_FRONTENDS} KF6")
ENDIF(BUILD_KF6)
IF(BUILD_XFCE)
# NOTE: The GTK+ 2.x plugin is XFCE only right now.
SET(UI_FRONTENDS "${UI_FRONTENDS} XFCE")

2
cmake/options.cmake
View File

@ -25,7 +25,7 @@ IF(UNIX AND NOT APPLE)
# Reference: https://cmake.org/pipermail/cmake/2016-October/064342.html
OPTION_UI(KDE4 "Build the KDE4 plugin.")
OPTION_UI(KF5 "Build the KDE Frameworks 5 plugin.")
#OPTION_UI(KF6 "Build the KDE Frameworks 6 plugin. (EXPERIMENTAL)") # NOTE: Only enable if debugging!
OPTION_UI(KF6 "Build the KDE Frameworks 6 plugin. (EXPERIMENTAL)")
OPTION_UI(XFCE "Build the XFCE (GTK+ 2.x) plugin. (Thunar 1.7 and earlier)")
OPTION_UI(GTK3 "Build the GTK+ 3.x plugin.")
OPTION_UI(GTK4 "Build the GTK 4.x plugin. (EXPERIMENTAL)")

5
src/kde/kf6/CMakeLists.txt
View File

@ -67,9 +67,6 @@ IF(ECM_MODULE_PATH AND ECM_KDE_MODULE_DIR)
REPLACE_HARDCODED_PREFIX(KF6_PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
SET(QT_PLUGIN_INSTALL_DIR "${KF6_PLUGIN_INSTALL_DIR}")
### FIXME: KF6 isn't available yet, so we're only
### compile-testing against Qt6.
# Find KF6.
FIND_PACKAGE(KF6 ${REQUIRE_KF6} COMPONENTS KIO WidgetsAddons FileMetaData)
IF(NOT KF6KIO_FOUND OR NOT KF6WidgetsAddons_FOUND OR NOT KF6FileMetaData_FOUND)
@ -235,7 +232,6 @@ IF(BUILD_KF6)
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../..> # src
)
TARGET_LINK_LIBRARIES(${XATTRVIEW_NAME} PRIVATE romdata)
# NOTE: KF6 is still using the KF6 namespace for now.
TARGET_LINK_LIBRARIES(${XATTRVIEW_NAME} PRIVATE KF6::KIOCore KF6::KIOWidgets)
TARGET_LINK_LIBRARIES(${XATTRVIEW_NAME} PUBLIC Qt6::Widgets Qt6::Gui Qt6::Core)
@ -248,7 +244,6 @@ IF(BUILD_KF6)
)
SET_TARGET_PROPERTIES(kfilemetadata_${PROJECT_NAME} PROPERTIES PREFIX "")
DO_SPLIT_DEBUG(kfilemetadata_${PROJECT_NAME})
# NOTE: KF6 is still using the KF6 namespace for now.
TARGET_LINK_LIBRARIES(kfilemetadata_${PROJECT_NAME} PRIVATE KF6::KIOCore KF6::FileMetaData)
TARGET_LINK_LIBRARIES(kfilemetadata_${PROJECT_NAME} PRIVATE Qt6::Core)