Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix mongo-c-driver for custom VCPKG_BUILD_TYPE #18569

Merged
merged 5 commits into from
Jul 1, 2021
Merged

Fix mongo-c-driver for custom VCPKG_BUILD_TYPE #18569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd0eb77
Fix mongo-c-driver for custom VCPKG_BUILD_TYPE
ahojnnes Jun 21, 2021
97a011a
Update version
ahojnnes Jun 21, 2021
1e481bd
Update ports/mongo-c-driver/portfile.cmake
JackBoosY Jun 22, 2021
9993978
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jun 23, 2021
b06ccf5
Update versions/m-/mongo-c-driver.json
JackBoosY Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/mongo-c-driver/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
34 changes: 21 additions & 13 deletions ports/mongo-c-driver/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4070,7 +4070,7 @@
},
"mongo-c-driver": {
"baseline": "1.16.1",
"port-version": 4
"port-version": 5
},
"mongo-cxx-driver": {
"baseline": "3.4.0-5",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mongo-c-driver.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6a68782eaa1afe2fc3de47db769e230ebd542ca7",
"version-string": "1.16.1",
"port-version": 5
},
{
"git-tree": "6b948f7f7ff67f47481c2630ba40ab300bceee01",
"version-string": "1.16.1",
Expand Down