From c90e0fefd7e1e25b76cbd74320bf9a135f3b31ab Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 11 Feb 2018 09:03:46 +0100 Subject: [PATCH] Make it possible to override FALKON_PLUGIN_PATH from cache --- CMakeLists.txt | 5 +++-- config.h.cmake | 2 +- src/lib/app/datapaths.cpp | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35fec1f50..8c532cb7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,10 +31,11 @@ else() set(FALKON_INSTALL_PLUGINDIR "${KDE_INSTALL_PLUGINDIR}") endif() if (IS_ABSOLUTE ${FALKON_INSTALL_PLUGINDIR}) - set(FALKON_PLUGIN_PATH "${FALKON_INSTALL_PLUGINDIR}") + set(PLUGIN_PATH "${FALKON_INSTALL_PLUGINDIR}") else() - set(FALKON_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${FALKON_INSTALL_PLUGINDIR}") + set(PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${FALKON_INSTALL_PLUGINDIR}") endif() +set(FALKON_PLUGIN_PATH "${PLUGIN_PATH}" CACHE PATH "Default plugin search path") # Defines that are always set add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII) diff --git a/config.h.cmake b/config.h.cmake index e6c10450d..d35648e5b 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,7 +1,7 @@ /* config.h. Generated by cmake from config.h.cmake */ #define FALKON_VERSION "${PROJECT_VERSION}" -#define FALKON_PLUGIN_PATH "${FALKON_PLUGIN_PATH}" +#cmakedefine FALKON_PLUGIN_PATH "${FALKON_PLUGIN_PATH}" #cmakedefine FALKON_GIT_REVISION "${FALKON_GIT_REVISION}" /* Enable portable build */ diff --git a/src/lib/app/datapaths.cpp b/src/lib/app/datapaths.cpp index b83fbd4dc..27b5eccf1 100644 --- a/src/lib/app/datapaths.cpp +++ b/src/lib/app/datapaths.cpp @@ -87,7 +87,9 @@ void DataPaths::init() { m_paths[AppData].append(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation)); +#ifdef FALKON_PLUGIN_PATH m_paths[Plugins].append(QStringLiteral(FALKON_PLUGIN_PATH)); +#endif for (const QString &location : qAsConst(m_paths[AppData])) { initAssetsIn(location);