diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-10-17 12:00:41 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-20 13:58:28 -0700 |
| commit | f520aacf0ef9dc2bc601529d819dccb971b51b0c (patch) | |
| tree | 3f4806a63ddf65fc07fb0efe2dfe2292cc9a5cf0 | |
| parent | 12a0a9989b5434afde67690737a364d10f60a1b9 (diff) | |
| download | vcpkg-f520aacf0ef9dc2bc601529d819dccb971b51b0c.tar.gz vcpkg-f520aacf0ef9dc2bc601529d819dccb971b51b0c.zip | |
[libmariadb] Fix /MD for static libs. Fixes #4493.
| -rw-r--r-- | ports/libmariadb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libmariadb/md.patch | 13 | ||||
| -rw-r--r-- | ports/libmariadb/portfile.cmake | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index b9cfcbbef..0eff30a4b 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,3 +1,3 @@ Source: libmariadb
-Version: 3.0.2
+Version: 3.0.2-1
Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
diff --git a/ports/libmariadb/md.patch b/ports/libmariadb/md.patch new file mode 100644 index 000000000..42199cf92 --- /dev/null +++ b/ports/libmariadb/md.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef45ee8..470573e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,7 +110,7 @@ IF(NOT IS_SUBPROJECT)
+ IF(MSVC)
+ # Speedup system tests
+ INCLUDE(${CC_SOURCE_DIR}/cmake/WindowsCache.cmake)
+- IF (MSVC)
++ IF (MSVC AND 0)
+ SET(CONFIG_TYPES "DEBUG" "RELEASE" "RELWITHDEBINFO")
+ FOREACH(BUILD_TYPE ${CONFIG_TYPES})
+ FOREACH(COMPILER CXX C)
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index e37afb22f..95b852698 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( REF v3.0.2
SHA512 a5086ff149b1ca0e1b652013475c5f3793824416a60ec35018b6dcd502bd38b50fa040271ff8d308520dadecc9601671fccf67046fcda2425f1d7c59e1c6c52f
HEAD_REF master
+ PATCHES md.patch
)
vcpkg_configure_cmake(
@@ -78,7 +79,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb)
# copy & remove header files
-file(GLOB HEADER_FILES ${CURRENT_PACKAGES_DIR}/include/mariadb/*)
file(REMOVE
${CURRENT_PACKAGES_DIR}/include/mariadb/my_config.h.in
${CURRENT_PACKAGES_DIR}/include/mariadb/mysql_version.h.in
|