From 685f2a259fea2ae2bafd4c614089174fad332366 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 2 Dec 2015 13:12:54 +0100 Subject: [PATCH] csync: remove PLUGIN install patch from cmake files This conflicts with the KDE_INSTALL_PLUGINDIR and prevent the dolphin plugin to be installed at the right location. Since csync no longer have plugin, this can be removed --- cmake/modules/DefineInstallationPaths.cmake | 5 ----- csync/ConfigureChecks.cmake | 1 - csync/config_csync.h.cmake | 1 - 3 files changed, 7 deletions(-) diff --git a/cmake/modules/DefineInstallationPaths.cmake b/cmake/modules/DefineInstallationPaths.cmake index 3f44af6c0..fafad83c1 100644 --- a/cmake/modules/DefineInstallationPaths.cmake +++ b/cmake/modules/DefineInstallationPaths.cmake @@ -41,10 +41,6 @@ if (UNIX) "${LIB_INSTALL_DIR}" CACHE PATH "The subdirectory relative to the install prefix where private libs are installed" ) - SET(PLUGIN_INSTALL_DIR - "${LIB_INSTALL_DIR}" - CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_SHORTNAME})" - ) SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The subdirectory to the header prefix (default prefix/include)" @@ -106,7 +102,6 @@ if (WIN32) set(SBIN_INSTALL_DIR "." CACHE PATH "-") set(LIB_INSTALL_DIR "lib" CACHE PATH "-") set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-") - set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-") set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-") set(ICON_INSTALL_DIR "." CACHE PATH "-") set(SOUND_INSTALL_DIR "." CACHE PATH "-") diff --git a/csync/ConfigureChecks.cmake b/csync/ConfigureChecks.cmake index 20245f629..94f612999 100644 --- a/csync/ConfigureChecks.cmake +++ b/csync/ConfigureChecks.cmake @@ -9,7 +9,6 @@ set(PACKAGE ${APPLICATION_NAME}) set(VERSION ${APPLICATION_VERSION}) set(DATADIR ${DATA_INSTALL_DIR}) set(LIBDIR ${LIB_INSTALL_DIR}) -set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}") set(SYSCONFDIR ${SYSCONF_INSTALL_DIR}) set(BINARYDIR ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/csync/config_csync.h.cmake b/csync/config_csync.h.cmake index 907fea661..c42eb1045 100644 --- a/csync/config_csync.h.cmake +++ b/csync/config_csync.h.cmake @@ -2,7 +2,6 @@ #cmakedefine VERSION "${APPLICATION_VERSION}" #cmakedefine LOCALEDIR "${LOCALE_INSTALL_DIR}" #cmakedefine LIBDIR "${LIBDIR}" -#cmakedefine PLUGINDIR "${PLUGINDIR}" #cmakedefine SYSCONFDIR "${SYSCONFDIR}" #cmakedefine BINARYDIR "${BINARYDIR}" #cmakedefine SOURCEDIR "${SOURCEDIR}" -- 2.30.2