Make it possible to override FALKON_PLUGIN_PATH from cache

remotes/origin/Falkon/3.0
David Rosca 8 years ago
parent 3e1e49f3d3
commit c90e0fefd7
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
  1. 5
      CMakeLists.txt
  2. 2
      config.h.cmake
  3. 2
      src/lib/app/datapaths.cpp

@ -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)

@ -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 */

@ -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);

Loading…
Cancel
Save