kf5 corrections
This commit is contained in:
parent
cd612d2812
commit
90fe8e3478
|
|
@ -0,0 +1,2 @@
|
||||||
|
export QT_PLUGIN_PATH=$HOME/.local/lib/qt5/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}
|
||||||
|
export QML_IMPORT_PATH=$HOME/.local/lib/x86_64-linux-gnu/qml${QML_IMPORT_PATH:+:$QML_IMPORT_PATH}
|
||||||
|
|
@ -41,12 +41,9 @@ if(OLLIE_KF5)
|
||||||
# --- Qt5 / KF5 ---
|
# --- Qt5 / KF5 ---
|
||||||
find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Quick Qml QuickControls2)
|
find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Quick Qml QuickControls2)
|
||||||
|
|
||||||
# Override KDE_INSTALL_PLUGINDIR so kcoreaddons_add_plugin installs to the
|
# Override KDE_INSTALL_PLUGINDIR so kcoreaddons_add_plugin installs under
|
||||||
# Qt5 plugin directory (e.g. /usr/lib/x86_64-linux-gnu/qt5/plugins).
|
# CMAKE_INSTALL_PREFIX (e.g. ~/.local/lib/qt5/plugins), not the system dir.
|
||||||
get_target_property(_QT5_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
|
set(KDE_INSTALL_PLUGINDIR "lib/qt5/plugins" CACHE PATH "" FORCE)
|
||||||
execute_process(COMMAND "${_QT5_QMAKE_EXECUTABLE}" -query QT_INSTALL_PLUGINS
|
|
||||||
OUTPUT_VARIABLE _QT5_PLUGIN_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
||||||
set(KDE_INSTALL_PLUGINDIR "${_QT5_PLUGIN_DIR}" CACHE PATH "" FORCE)
|
|
||||||
find_package(KF5 REQUIRED COMPONENTS
|
find_package(KF5 REQUIRED COMPONENTS
|
||||||
Notifications
|
Notifications
|
||||||
Runner
|
Runner
|
||||||
|
|
@ -82,7 +79,7 @@ if(OLLIE_KF5)
|
||||||
)
|
)
|
||||||
|
|
||||||
# --- Kate Plugin ---
|
# --- Kate Plugin ---
|
||||||
kcoreaddons_add_plugin(ollie_kate SOURCES kate/ollie_kate.cpp kate/ollie_ghost.cpp kate/chat_renderer.cpp INSTALL_NAMESPACE "kf5/ktexteditor")
|
kcoreaddons_add_plugin(ollie_kate SOURCES kate/ollie_kate.cpp kate/ollie_ghost.cpp kate/chat_renderer.cpp INSTALL_NAMESPACE "ktexteditor")
|
||||||
target_link_libraries(ollie_kate
|
target_link_libraries(ollie_kate
|
||||||
KF5::TextEditor
|
KF5::TextEditor
|
||||||
KF5::SyntaxHighlighting
|
KF5::SyntaxHighlighting
|
||||||
|
|
|
||||||
Reference in New Issue