From a46679dcf7b314f365f796fd78e12763a4c2c880 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Fri, 8 Sep 2017 16:08:44 +0000
Subject: Build improvements and cleanups.

- the probably ultimate fix for dependencies on VS
- remove some GET_TARGET_PROPERTY(LOCATION ...), they are deprecated in
cmake 3.9
- simplify signing targets on Windows.
- remove INSTALL_DEBUG_TARGET, we do not mix binaries from different builds
in the same package
---
 cmake/plugin.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'cmake/plugin.cmake')

diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index ba7bac837b1..f14edf0cd20 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -200,7 +200,9 @@ MACRO(MYSQL_ADD_PLUGIN)
       OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")  
     # Install dynamic library
     IF(ARG_COMPONENT)
-      IF(CPACK_COMPONENTS_ALL AND NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT})
+      IF(CPACK_COMPONENTS_ALL AND NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT}
+          AND INSTALL_SYSCONF2DIR)
+
         IF (ARG_STORAGE_ENGINE)
           SET(ver " = %{version}-%{release}")
         ENDIF()
-- 
cgit v1.2.1