fix qt_add_resources: add BASE gui so main.qml is at qrc:/main.qml

This commit is contained in:
Levi Neely 2026-08-01 08:43:41 +02:00
parent e7b3291826
commit b28921c39f
1 changed files with 6 additions and 54 deletions

View File

@ -96,25 +96,8 @@ if(OLLIE_KF5)
else() else()
# --- Qt6 / KF6 --- # --- Qt6 / KF6 ---
find_package(Qt6 REQUIRED COMPONENTS Core Concurrent DBus Widgets Quick QuickControls2 Multimedia Network) find_package(Qt6 REQUIRED COMPONENTS Core Widgets Quick QuickControls2)
find_package(KF6StatusNotifierItem REQUIRED) find_package(KF6 REQUIRED COMPONENTS Runner CoreAddons)
find_package(KF6 REQUIRED COMPONENTS Runner Notifications CoreAddons Config)
find_package(Plasma REQUIRED)
# --- System Tray ---
add_executable(ollie-tray
tray/main.cpp
tray/ollie_tray.cpp
)
target_include_directories(ollie-tray PRIVATE
${CMAKE_SOURCE_DIR}
)
target_link_libraries(ollie-tray
Qt6::Core
Qt6::DBus
Qt6::Widgets
KF6::StatusNotifierItem
)
# KDE's KDE_INSTALL_PLUGINDIR defaults to lib64/plugins/ but Qt6 plugins # KDE's KDE_INSTALL_PLUGINDIR defaults to lib64/plugins/ but Qt6 plugins
# live under lib64/qt6/plugins/. Override so kcoreaddons_add_plugin installs # live under lib64/qt6/plugins/. Override so kcoreaddons_add_plugin installs
@ -147,57 +130,26 @@ else()
target_link_libraries(ollie_kate ${KATEPRIVATE_LIB}) target_link_libraries(ollie_kate ${KATEPRIVATE_LIB})
endif() endif()
# --- Plasmoid QML Plugin --- # --- GUI App (9P-based, no D-Bus) ---
qt6_add_qml_module(ollie-plasmoid-plugin
URI org.ollie.private
VERSION 1.0
SOURCES
plasmoid/plugin/olliedbusclient.h
plasmoid/plugin/olliedbusclient.cpp
OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/org/ollie/private
)
target_link_libraries(ollie-plasmoid-plugin PRIVATE
Qt6::Core
Qt6::DBus
Qt6::Quick
)
target_include_directories(ollie-plasmoid-plugin PRIVATE
${CMAKE_SOURCE_DIR}/plasmoid/plugin
)
# --- Plasmoid Package ---
plasma_install_package(plasmoid org.ollie.plasmoid)
# --- GUI App ---
add_executable(ollie-gui add_executable(ollie-gui
gui/main.cpp gui/main.cpp
gui/thememanager.cpp gui/ollie9pclient.cpp
gui/chatblockmodel.cpp
plasmoid/plugin/olliedbusclient.cpp
) )
target_include_directories(ollie-gui PRIVATE target_include_directories(ollie-gui PRIVATE
${CMAKE_SOURCE_DIR}/plasmoid/plugin
${CMAKE_SOURCE_DIR}/gui ${CMAKE_SOURCE_DIR}/gui
) )
target_link_libraries(ollie-gui target_link_libraries(ollie-gui
Qt6::Core Qt6::Core
Qt6::Concurrent
Qt6::DBus
Qt6::Widgets Qt6::Widgets
Qt6::Quick Qt6::Quick
Qt6::QuickControls2 Qt6::QuickControls2
Qt6::Multimedia
Qt6::Network
KF6::ConfigCore
KF6::SyntaxHighlighting
) )
qt_add_resources(ollie-gui "gui" qt_add_resources(ollie-gui "gui"
PREFIX "/" PREFIX "/"
FILES gui/main.qml gui/ChatPane.qml gui/SessionGraph.qml gui/emojis.js BASE gui
FILES gui/main.qml
) )
# --- Install --- # --- Install ---
install(TARGETS ollie-gui DESTINATION ${KDE_INSTALL_BINDIR}) install(TARGETS ollie-gui DESTINATION ${KDE_INSTALL_BINDIR})
install(TARGETS ollie-plasmoid-plugin
DESTINATION ${KDE_INSTALL_QMLDIR}/org/ollie/private)
endif() endif()