diff --git a/CMakeLists.txt b/CMakeLists.txt index f51cc71a2..4ecf31d32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,13 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") +if (UNIX AND NOT APPLE) + set(FALKON_INSTALL_PLUGINDIR "${KDE_INSTALL_PLUGINDIR}/falkon") +else() + set(FALKON_INSTALL_PLUGINDIR "${KDE_INSTALL_PLUGINDIR}") +endif() +add_definitions(-DPLUGIN_PATH=\"${CMAKE_INSTALL_PREFIX}/${FALKON_INSTALL_PLUGINDIR}\") + # Version (TODO: move to a generated header once qmake support is dropped, to avoid full recompilations when changing this add_definitions(-DFALKON_VERSION=\"${PROJECT_VERSION}\") diff --git a/src/lib/app/datapaths.cpp b/src/lib/app/datapaths.cpp index 05cd23902..8c447b173 100644 --- a/src/lib/app/datapaths.cpp +++ b/src/lib/app/datapaths.cpp @@ -94,6 +94,10 @@ void DataPaths::init() #endif m_paths[AppData].append(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)); +#if defined(PLUGIN_PATH) + m_paths[Plugins].append(QStringLiteral(PLUGIN_PATH)); +#endif + for (const QString &location : qAsConst(m_paths[AppData])) { initAssetsIn(location); } diff --git a/src/plugins/AccessKeysNavigation/CMakeLists.txt b/src/plugins/AccessKeysNavigation/CMakeLists.txt index a93d4137c..8b1a5e4a7 100644 --- a/src/plugins/AccessKeysNavigation/CMakeLists.txt +++ b/src/plugins/AccessKeysNavigation/CMakeLists.txt @@ -15,6 +15,6 @@ set( AccessKeysNavigation_RSCS qt5_add_resources(RSCS ${AccessKeysNavigation_RSCS}) add_library(AccessKeysNavigation MODULE ${AccessKeysNavigation_SRCS} ${UIS} ${RSCS}) -install(TARGETS AccessKeysNavigation DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS AccessKeysNavigation DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(AccessKeysNavigation FalkonPrivate) diff --git a/src/plugins/AutoScroll/CMakeLists.txt b/src/plugins/AutoScroll/CMakeLists.txt index e1dc3f349..0382c6e51 100644 --- a/src/plugins/AutoScroll/CMakeLists.txt +++ b/src/plugins/AutoScroll/CMakeLists.txt @@ -16,6 +16,6 @@ set( AutoScroll_RSCS qt5_add_resources(RSCS ${AutoScroll_RSCS}) add_library(AutoScroll MODULE ${AutoScroll_SRCS} ${UIS} ${RSCS}) -install(TARGETS AutoScroll DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS AutoScroll DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(AutoScroll FalkonPrivate) diff --git a/src/plugins/FlashCookieManager/CMakeLists.txt b/src/plugins/FlashCookieManager/CMakeLists.txt index 38a3ae6ce..3471a72f3 100644 --- a/src/plugins/FlashCookieManager/CMakeLists.txt +++ b/src/plugins/FlashCookieManager/CMakeLists.txt @@ -16,6 +16,6 @@ set( FlashCookieManager_RSCS qt5_add_resources(RSCS ${FlashCookieManager_RSCS}) add_library(FlashCookieManager MODULE ${FlashCookieManager_SRCS} ${UIS} ${RSCS}) -install(TARGETS FlashCookieManager DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS FlashCookieManager DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(FlashCookieManager FalkonPrivate) diff --git a/src/plugins/GnomeKeyringPasswords/CMakeLists.txt b/src/plugins/GnomeKeyringPasswords/CMakeLists.txt index e876cc9f8..57c15a69e 100644 --- a/src/plugins/GnomeKeyringPasswords/CMakeLists.txt +++ b/src/plugins/GnomeKeyringPasswords/CMakeLists.txt @@ -11,6 +11,6 @@ set( GnomeKeyringPasswords_RSCS qt5_add_resources(RSCS ${GnomeKeyringPasswords_RSCS}) add_library(GnomeKeyringPasswords MODULE ${GnomeKeyringPasswords_SRCS} ${RSCS}) -install(TARGETS GnomeKeyringPasswords DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS GnomeKeyringPasswords DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(GnomeKeyringPasswords ${GNOME_KEYRING_LIBRARIES} FalkonPrivate) diff --git a/src/plugins/GreaseMonkey/CMakeLists.txt b/src/plugins/GreaseMonkey/CMakeLists.txt index ce3f5a717..cc81ca322 100644 --- a/src/plugins/GreaseMonkey/CMakeLists.txt +++ b/src/plugins/GreaseMonkey/CMakeLists.txt @@ -28,6 +28,6 @@ set( GreaseMonkey_RSCS qt5_add_resources(RSCS ${GreaseMonkey_RSCS}) add_library(GreaseMonkey MODULE ${GreaseMonkey_SRCS} ${UIS} ${RSCS}) -install(TARGETS GreaseMonkey DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS GreaseMonkey DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(GreaseMonkey FalkonPrivate) diff --git a/src/plugins/ImageFinder/CMakeLists.txt b/src/plugins/ImageFinder/CMakeLists.txt index d5a42df85..00be676ae 100644 --- a/src/plugins/ImageFinder/CMakeLists.txt +++ b/src/plugins/ImageFinder/CMakeLists.txt @@ -15,6 +15,6 @@ set( ImageFinder_RSCS qt5_add_resources(RSCS ${ImageFinder_RSCS}) add_library(ImageFinder MODULE ${ImageFinder_SRCS} ${UIS} ${RSCS}) -install(TARGETS ImageFinder DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS ImageFinder DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(ImageFinder FalkonPrivate) diff --git a/src/plugins/KWalletPasswords/CMakeLists.txt b/src/plugins/KWalletPasswords/CMakeLists.txt index 5d74ebc98..9ec07c77d 100644 --- a/src/plugins/KWalletPasswords/CMakeLists.txt +++ b/src/plugins/KWalletPasswords/CMakeLists.txt @@ -9,6 +9,6 @@ set( KWalletPasswords_RSCS qt5_add_resources(RSCS ${KWalletPasswords_RSCS}) add_library(KWalletPasswords MODULE ${KWalletPasswords_SRCS} ${RSCS}) -install(TARGETS KWalletPasswords DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS KWalletPasswords DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(KWalletPasswords FalkonPrivate KF5::Wallet) diff --git a/src/plugins/MouseGestures/CMakeLists.txt b/src/plugins/MouseGestures/CMakeLists.txt index 4ac6dd094..f51b4b410 100644 --- a/src/plugins/MouseGestures/CMakeLists.txt +++ b/src/plugins/MouseGestures/CMakeLists.txt @@ -27,6 +27,6 @@ qt5_add_resources(RSCS ${MouseGestures_RSCS}) KDE_ENABLE_EXCEPTIONS() add_library(MouseGestures MODULE ${MouseGestures_SRCS} ${UIS} ${RSCS}) -install(TARGETS MouseGestures DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS MouseGestures DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(MouseGestures FalkonPrivate) diff --git a/src/plugins/PIM/CMakeLists.txt b/src/plugins/PIM/CMakeLists.txt index c974c2323..79ac0a452 100644 --- a/src/plugins/PIM/CMakeLists.txt +++ b/src/plugins/PIM/CMakeLists.txt @@ -15,6 +15,6 @@ set( PIM_RSCS qt5_add_resources(RSCS ${PIM_RSCS}) add_library(PIM MODULE ${PIM_SRCS} ${UIS} ${RSCS}) -install(TARGETS PIM DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS PIM DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(PIM FalkonPrivate) diff --git a/src/plugins/StatusBarIcons/CMakeLists.txt b/src/plugins/StatusBarIcons/CMakeLists.txt index b2ea3b54d..555900d06 100644 --- a/src/plugins/StatusBarIcons/CMakeLists.txt +++ b/src/plugins/StatusBarIcons/CMakeLists.txt @@ -26,6 +26,6 @@ set( StatusBarIcons_RSCS qt5_add_resources(RSCS ${StatusBarIcons_RSCS}) add_library(StatusBarIcons MODULE ${StatusBarIcons_SRCS} ${UIS} ${RSCS}) -install(TARGETS StatusBarIcons DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS StatusBarIcons DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(StatusBarIcons FalkonPrivate) diff --git a/src/plugins/TabManager/CMakeLists.txt b/src/plugins/TabManager/CMakeLists.txt index 27bf7d40d..af2a56e2c 100644 --- a/src/plugins/TabManager/CMakeLists.txt +++ b/src/plugins/TabManager/CMakeLists.txt @@ -20,6 +20,6 @@ set( TabManager_RSCS qt5_add_resources(RSCS ${TabManager_RSCS}) add_library(TabManager MODULE ${TabManager_SRCS} ${UIS} ${RSCS}) -install(TARGETS TabManager DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS TabManager DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(TabManager FalkonPrivate) diff --git a/src/plugins/TestPlugin/CMakeLists.txt b/src/plugins/TestPlugin/CMakeLists.txt index d77a3f0e9..ad7afb1d4 100644 --- a/src/plugins/TestPlugin/CMakeLists.txt +++ b/src/plugins/TestPlugin/CMakeLists.txt @@ -4,6 +4,6 @@ set( TestPlugin_SRCS ) add_library(TestPlugin MODULE ${TestPlugin_SRCS} ${RSCS}) -install(TARGETS TestPlugin DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS TestPlugin DESTINATION ${FALKON_INSTALL_PLUGINDIR}) target_link_libraries(TestPlugin FalkonPrivate)