summaryrefslogtreecommitdiff
path: root/cmake/plugin.cmake
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-09-19 12:06:50 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-09-19 12:06:50 +0300
commitec6042bda097fa53c43caf4a1acc32c5a77f6ed4 (patch)
tree751af6227789bfa916a6de426542a966845c8cd1 /cmake/plugin.cmake
parentba0ee91077d9b89296328892aa5d5d293f4e0fb1 (diff)
parentb337a0682943fa7e055380b7859762acf7fb588c (diff)
downloadmariadb-git-ec6042bda097fa53c43caf4a1acc32c5a77f6ed4.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'cmake/plugin.cmake')
-rw-r--r--cmake/plugin.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 3e7c5804f77..591c448a793 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -222,7 +222,8 @@ MACRO(MYSQL_ADD_PLUGIN)
# Install dynamic library
IF(ARG_COMPONENT)
IF(CPACK_COMPONENTS_ALL AND
- NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT})
+ NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT}
+ AND INSTALL_SYSCONF2DIR)
IF (ARG_STORAGE_ENGINE)
SET(ver " = %{version}-%{release}")
ELSE()