diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-06-15 19:33:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 10:33:31 -0700 |
| commit | e2c3030703f953cfa60b60f9aa01f448f817187e (patch) | |
| tree | 8086d107d31c98b1d74dd250e418a3a0321cf77c | |
| parent | 0faf2ab829704eef529eedafed0405c4cd6289ce (diff) | |
| download | vcpkg-e2c3030703f953cfa60b60f9aa01f448f817187e.tar.gz vcpkg-e2c3030703f953cfa60b60f9aa01f448f817187e.zip | |
[libpq] Add Secur32.lib and openssl to libpq cmake wrapper (#18377)
* [libpq] add secur32.lib to wrapper
* version stuff
* add openssl fix.
* fix version stuff
| -rw-r--r-- | ports/libpq/vcpkg-cmake-wrapper.cmake | 18 | ||||
| -rw-r--r-- | ports/libpq/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libpq.json | 5 |
4 files changed, 25 insertions, 2 deletions
diff --git a/ports/libpq/vcpkg-cmake-wrapper.cmake b/ports/libpq/vcpkg-cmake-wrapper.cmake index 4226cf674..200b10d48 100644 --- a/ports/libpq/vcpkg-cmake-wrapper.cmake +++ b/ports/libpq/vcpkg-cmake-wrapper.cmake @@ -45,4 +45,22 @@ if(PostgreSQL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") list(APPEND PostgreSQL_LIBRARIES ${PostgreSQL_${LIB_ITEM}_LIBRARY})
endif()
endforeach()
+ if(WIN32)
+ if(TARGET PostgreSQL::PostgreSQL)
+ set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Secur32.lib")
+ endif()
+ list(APPEND PostgreSQL_LIBRARIES Secur32.lib)
+ endif()
+ cmake_policy(PUSH)
+ cmake_policy(SET CMP0057 NEW)
+ set(Z_VCPKG_PORT_FEATURES "@FEATURES@")
+ if("openssl" IN_LIST Z_VCPKG_PORT_FEATURES)
+ find_package(OpenSSL REQUIRED)
+ if(TARGET PostgreSQL::PostgreSQL)
+ set_property(TARGET PostgreSQL::PostgreSQL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "OpenSSL::SSL")
+ endif()
+ list(APPEND PostgreSQL_LIBRARIES OpenSSL::SSL)
+ endif()
+ unset(Z_VCPKG_PORT_FEATURES)
+ cmake_policy(POP)
endif()
diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 0b1e5f772..a96a1f8b5 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", "version": "12.2", - "port-version": 16, + "port-version": 17, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 33ad28f17..cbba0301d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3454,7 +3454,7 @@ }, "libpq": { "baseline": "12.2", - "port-version": 16 + "port-version": 17 }, "libpqxx": { "baseline": "7.3.1", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index 76ef61a9e..cc0946d63 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "01e2ad37b9df46e45826e52a6cddfb95ca137abd", + "version": "12.2", + "port-version": 17 + }, + { "git-tree": "7c75f4ea669ee37e510cb5d7ea0e39b0a7d3f6cb", "version": "12.2", "port-version": 16 |