41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
From 871e5ed7064768383025271669e7d0cded12ca6c Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sat, 12 Sep 2020 20:30:49 +0200
|
|
Subject: [PATCH 2/2] Enable pkg-config for mingw-w64 build
|
|
|
|
---
|
|
libmariadb/CMakeLists.txt | 13 ++++---------
|
|
1 file changed, 4 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
|
|
index f0a2f56..a0d2e2c 100644
|
|
--- a/libmariadb/CMakeLists.txt
|
|
+++ b/libmariadb/CMakeLists.txt
|
|
@@ -492,19 +492,14 @@ ENDIF()
|
|
INSTALL(TARGETS mariadbclient
|
|
COMPONENT Development
|
|
DESTINATION ${INSTALL_LIBDIR})
|
|
-IF(WIN32)
|
|
-INSTALL(TARGETS libmariadb
|
|
+IF(WIN32 AND NOT MINGW)
|
|
+INSTALL(TARGETS mariadb
|
|
COMPONENT SharedLibraries
|
|
DESTINATION ${INSTALL_LIBDIR})
|
|
ELSE()
|
|
# in cmake 3.12+ we can use
|
|
-#INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
|
|
-# COMPONENT SharedLibraries NAMELINK_COMPONENT Development)
|
|
-# but as long as we build on CentOS 7 with its cmake 2.8.12.2 we have to use
|
|
-INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
|
|
- COMPONENT SharedLibraries NAMELINK_SKIP)
|
|
-INSTALL(TARGETS mariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR}
|
|
- COMPONENT Development NAMELINK_ONLY)
|
|
+INSTALL(TARGETS mariadb RUNTIME DESTINATION ${INSTALL_BINDIR} ARCHIVE DESTINATION ${INSTALL_LIBDIR} LIBRARY DESTINATION ${INSTALL_LIBDIR}
|
|
+ COMPONENT SharedLibraries NAMELINK_COMPONENT Development)
|
|
ENDIF()
|
|
|
|
IF(MSVC)
|
|
--
|
|
2.38.1
|
|
|