diff options
| author | Johannes Schönberger <johannes.schonberger@microsoft.com> | 2021-07-01 19:03:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 09:03:05 -0700 |
| commit | 9e104306a7d0775602310bb1b1873fbafca3468d (patch) | |
| tree | cb96ed7ff39d5e9bc979d5cc030e5d83098afcc4 | |
| parent | d93cf33a224a9cc8de9ed92084b5d31c1f86bb15 (diff) | |
| download | vcpkg-9e104306a7d0775602310bb1b1873fbafca3468d.tar.gz vcpkg-9e104306a7d0775602310bb1b1873fbafca3468d.zip | |
[mongo-c-driver] Fix for custom VCPKG_BUILD_TYPE (#18569)
* Fix mongo-c-driver for custom VCPKG_BUILD_TYPE
* Update version
* Update ports/mongo-c-driver/portfile.cmake
* Update versions/m-/mongo-c-driver.json
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
| -rw-r--r-- | ports/mongo-c-driver/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mongo-c-driver/portfile.cmake | 34 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/m-/mongo-c-driver.json | 5 |
4 files changed, 28 insertions, 15 deletions
diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index 6472ce1a2..54a225a02 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -1,6 +1,6 @@ Source: mongo-c-driver Version: 1.16.1 -Port-Version: 4 +Port-Version: 5 Build-Depends: libbson, openssl (!windows), zlib Description: Client library written in C for MongoDB. Homepage: https://github.com/mongodb/mongo-c-driver diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 9ddf3a6b4..eca359bd6 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -85,20 +85,28 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_TARGET_IS_UWP) - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a - ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a) + if(NOT VCPKG_TARGET_IS_WINDOWS) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a + ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a) + endif() else() - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + endif() endif() # drop the __declspec(dllimport) when building static diff --git a/versions/baseline.json b/versions/baseline.json index b1684659f..023cb4347 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4078,7 +4078,7 @@ }, "mongo-c-driver": { "baseline": "1.16.1", - "port-version": 4 + "port-version": 5 }, "mongo-cxx-driver": { "baseline": "3.4.0-5", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index ae6105049..033ff1e25 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "6a68782eaa1afe2fc3de47db769e230ebd542ca7", + "version-string": "1.16.1", + "port-version": 5 + }, + { "git-tree": "6b948f7f7ff67f47481c2630ba40ab300bceee01", "version-string": "1.16.1", "port-version": 4 |