mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 07:45:11 +08:00
4e73d1b47a
* [libmariadb] Fix build error on Linux * x-add-version * Revert ci.baseline.txt * fix CMake export * change ci.baseline.txt to open test libmariadb * x-add-version * Revert ci.baseline.txt * remove CMAKE_SHARED_LIBRARY_C_FLAGS * x-add-version
27 lines
983 B
Diff
27 lines
983 B
Diff
diff --git a/include/mariadb_version.h.in b/include/mariadb_version.h.in
|
|
index a82dbb7..e9005fa 100644
|
|
--- a/include/mariadb_version.h.in
|
|
+++ b/include/mariadb_version.h.in
|
|
@@ -30,7 +30,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@/@INSTALL_PLUGINDIR@"
|
|
+#define MARIADB_PLUGINDIR "../@INSTALL_PLUGINDIR@"
|
|
|
|
/* mysqld compile time options */
|
|
#ifndef MYSQL_CHARSET
|
|
diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in
|
|
index 36c0117..4184e4b 100644
|
|
--- a/mariadb_config/mariadb_config.c.in
|
|
+++ b/mariadb_config/mariadb_config.c.in
|
|
@@ -225,7 +225,7 @@ end:
|
|
}
|
|
if (!p || !p[0])
|
|
{
|
|
- strncpy(installation_dir, "@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1);
|
|
+ strncpy(installation_dir, "../@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1);
|
|
return;
|
|
}
|
|
}
|