summaryrefslogtreecommitdiff
path: root/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2022-02-17 14:09:54 +0000
committerBernard Spil <brnrd@FreeBSD.org>2022-02-17 14:09:54 +0000
commit94df86eca53ee6a0196d010200ae3cd65e672945 (patch)
tree77b56a2b7ef056858440901217fbd64abd6c65e4 /databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
parentnet-im/scli: Update to 0.7.0 (diff)
databases/mariadb104-server: Security update to 10.4.24
PR: 261969 Security: ff5606f7-8a45-11ec-8be6-d4c9ef517024 MFH: 2022Q1
Diffstat (limited to 'databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt')
-rw-r--r--databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt18
1 files changed, 11 insertions, 7 deletions
diff --git a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
index 0542221db134..8f6733715ad3 100644
--- a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
+++ b/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
@@ -1,14 +1,18 @@
---- libmariadb/libmariadb/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
+--- libmariadb/libmariadb/CMakeLists.txt.orig 2022-02-10 19:42:57 UTC
+++ libmariadb/libmariadb/CMakeLists.txt
-@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
+@@ -459,6 +459,7 @@ IF(NOT WIN32)
+ SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}")
+ ENDIF()
+
++IF(NOT WITHOUT_CLIENT)
INSTALL(TARGETS mariadbclient
COMPONENT Development
DESTINATION ${INSTALL_LIBDIR})
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(TARGETS libmariadb
- COMPONENT SharedLibraries
- DESTINATION ${INSTALL_LIBDIR})
+@@ -470,6 +471,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTA
+ COMPONENT SharedLibraries NAMELINK_SKIP)
+ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
+ COMPONENT Development NAMELINK_ONLY)
+ENDIF()
- IF(WIN32)
+ IF(MSVC)
# On Windows, install PDB