3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 04:28:01 +08:00
Code Issues Projects Releases Wiki Activity

[libmariadb] Fix /MD for static libs. Fixes #4493.

Browse Source
This commit is contained in:
Robert Schumacher 2018-10-17 12:00:41 -07:00
parent 12a0a9989b
commit f520aacf0e
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libmariadb/CONTROL
View File

@ -1,3 +1,3 @@
Source: libmariadb 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 Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases

13
ports/libmariadb/md.patch Normal file
View File

@ -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)

2
ports/libmariadb/portfile.cmake
View File

@ -11,6 +11,7 @@ vcpkg_from_github(
REF v3.0.2 REF v3.0.2
SHA512 a5086ff149b1ca0e1b652013475c5f3793824416a60ec35018b6dcd502bd38b50fa040271ff8d308520dadecc9601671fccf67046fcda2425f1d7c59e1c6c52f SHA512 a5086ff149b1ca0e1b652013475c5f3793824416a60ec35018b6dcd502bd38b50fa040271ff8d308520dadecc9601671fccf67046fcda2425f1d7c59e1c6c52f
HEAD_REF master HEAD_REF master
PATCHES md.patch
) )
vcpkg_configure_cmake( vcpkg_configure_cmake(
@ -78,7 +79,6 @@ file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/lib/mariadb) ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb)
# copy & remove header files # copy & remove header files
file(GLOB HEADER_FILES ${CURRENT_PACKAGES_DIR}/include/mariadb/*)
file(REMOVE file(REMOVE
${CURRENT_PACKAGES_DIR}/include/mariadb/my_config.h.in ${CURRENT_PACKAGES_DIR}/include/mariadb/my_config.h.in
${CURRENT_PACKAGES_DIR}/include/mariadb/mysql_version.h.in ${CURRENT_PACKAGES_DIR}/include/mariadb/mysql_version.h.in