Add PLUGINDIR cmake setting and define #7027

By default, plugins are only searched next to the binary or next to the
other Qt plugins. This optional build variable allows another path to be
configured.

The idea is that on linux the oC packaging probably wants the binary in
something like /opt/owncloud/bin and the plugins in
/opt/owncloud/lib/plugins.

Similarly, distribution packagers probably don't want the plugins next
to the binary or next to the other Qt plugins. This flag allows them to
configure another path that the executable will look in.

CMakeLists.txt

@@ -69,6 +69,7 @@ if(WIN32)
 set(DATADIR "share")
 endif(WIN32)
 set(SHAREDIR ${DATADIR})
+set(PLUGINDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/plugins" CACHE STRING "Extra path to look for Qt plugins like for VFS. May be relative to binary.")
 
 #####
 ## handle BUILD_OWNCLOUD_OSX_BUNDLE

config.h.in

@@ -25,5 +25,6 @@
 
 #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
 #cmakedefine SHAREDIR "@SHAREDIR@"
+#cmakedefine PLUGINDIR "@PLUGINDIR@"
 
 #endif

src/gui/application.cpp

@@ -253,6 +253,17 @@ Application::Application(int &argc, char **argv)
  if (!AbstractNetworkJob::httpTimeout)
  AbstractNetworkJob::httpTimeout = cfg.timeout();
 
+#ifdef PLUGINDIR
+ // Setup extra plugin search path
+ QString extraPluginPath = QStringLiteral(PLUGINDIR);
+ if (!extraPluginPath.isEmpty()) {
+ if (QDir::isRelativePath(extraPluginPath))
+ extraPluginPath = QDir(QApplication::applicationDirPath()).filePath(extraPluginPath);
+ qCInfo(lcApplication) << "Adding extra plugin search path:" << extraPluginPath;
+ addLibraryPath(extraPluginPath);
+ }
+#endif
+
  // Check vfs plugins
  if (Theme::instance()->showVirtualFilesOption() && bestAvailableVfsMode() == Vfs::Off) {
  qCWarning(lcApplication) << "Theme wants to show vfs mode, but no vfs plugins are available";

src/libsync/vfs/suffix/CMakeLists.txt

@@ -14,7 +14,7 @@ set_target_properties("${synclib_NAME}_vfs_suffix" PROPERTIES
 )
 
 INSTALL(TARGETS "${synclib_NAME}_vfs_suffix"
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/plugins"
- RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}/plugins"
+ LIBRARY DESTINATION "${PLUGINDIR}"
+ RUNTIME DESTINATION "${PLUGINDIR}"
 )