Fix for MDEV-19807:

If MariaDB Connector/C is build as subproject in server tree, the path for client plugins is wrong. C/C sets it's own configuration only if PLUGINDIR wasn't defined by server build already.
mariadb-corporation · Jun 20, 2019 · 690f74a · 690f74a
1 parent c098613
commit 690f74a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -189,7 +189,7 @@ ENDIF()
 
 INCLUDE("${CC_SOURCE_DIR}/cmake/install.cmake")
 IF(NOT PLUGINDIR)
-  SET(PLUGINDIR "${INSTALL_PLUGINDIR}")
+  SET(PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}")
 ENDIF()
 
 # todo: we don't character sets in share - all is compiled in

diff --git a/include/mariadb_version.h.in b/include/mariadb_version.h.in
@@ -24,7 +24,7 @@
 #define MARIADB_PACKAGE_VERSION_ID @MARIADB_PACKAGE_VERSION_ID@
 #define MARIADB_SYSTEM_TYPE "@CMAKE_SYSTEM_NAME@"
 #define MARIADB_MACHINE_TYPE "@CMAKE_SYSTEM_PROCESSOR@"
-#define MARIADB_PLUGINDIR "@CMAKE_INSTALL_PREFIX@/@PLUGINDIR@"
+#define MARIADB_PLUGINDIR "@PLUGINDIR@"
 
 /* mysqld compile time options */
 #ifndef MYSQL_CHARSET