diff options
| author | hlysunnaram <hlysunnaram@users.noreply.github.com> | 2018-10-04 08:09:42 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-03 23:09:42 -0700 |
| commit | 008c5d8668b9a0b42dee249057bac223a3e3f896 (patch) | |
| tree | 72acafe702337b9891ae33d23cff4a5f28814b4f /ports/libmysql | |
| parent | 0fe2068a564080e5470ffe00c455592e625a0fd1 (diff) | |
| download | vcpkg-008c5d8668b9a0b42dee249057bac223a3e3f896.tar.gz vcpkg-008c5d8668b9a0b42dee249057bac223a3e3f896.zip | |
Handle VCPKG_BUILD_TYPE (#4287)
* [curl] fix build failure when VCPKG_BUILD_TYPE is set
* [libmysql] fix build failure when VCPKG_BUILD_TYPE is set
* [openssl-windows] use VCPKG_BUILD_TYPE to build release or debug only
* [icu] use VCPKG_BUILD_TYPE to build release or debug only
* [gdal] use VCPKG_BUILD_TYPE to build release or debug only
* bump versions of curl, gdal, icu, libmysql and openssl-windows
Diffstat (limited to 'ports/libmysql')
| -rw-r--r-- | ports/libmysql/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libmysql/portfile.cmake | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ports/libmysql/CONTROL b/ports/libmysql/CONTROL index 6f856c607..007718af7 100644 --- a/ports/libmysql/CONTROL +++ b/ports/libmysql/CONTROL @@ -1,4 +1,4 @@ Source: libmysql -Version: 8.0.4-2 +Version: 8.0.4-3 Build-Depends: boost-algorithm, boost-geometry, boost-optional, boost-functional, boost-graph, openssl, icu, libevent, liblzma, lz4, zlib Description: A MySQL client library for C development. diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 0e7b69edf..dfd38c41c 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -100,13 +100,18 @@ else() ${CURRENT_PACKAGES_DIR}/lib/mysqlclient.lib ${CURRENT_PACKAGES_DIR}/debug/lib/mysqlclient.lib) - # correct the dll directory - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/bin/libmysql.dll) - file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/bin/libmysql.pdb) - file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.dll) - file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.pdb) + # correct the dll directory
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/bin/libmysql.dll) + file (RENAME ${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/bin/libmysql.pdb) + endif() +
+ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.dll) + file (RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb ${CURRENT_PACKAGES_DIR}/debug/bin/libmysql.pdb) + endif() endif() file(READ ${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h _contents) |