mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 04:37:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libpq] Add Secur32.lib and openssl to libpq cmake wrapper (#18377)

Browse Source 
* [libpq] add secur32.lib to wrapper

* version stuff

* add openssl fix.

* fix version stuff
This commit is contained in:
Alexander Neumann 2021-06-15 19:33:31 +02:00 committed by GitHub
parent 0faf2ab829
commit e2c3030703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ports/libpq/vcpkg-cmake-wrapper.cmake
View File

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

2
ports/libpq/vcpkg.json
View File

@ -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",

2
versions/baseline.json
View File

@ -3454,7 +3454,7 @@
},
"libpq": {
"baseline": "12.2",
"port-version": 16
"port-version": 17
},
"libpqxx": {
"baseline": "7.3.1",

5
versions/l-/libpq.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "01e2ad37b9df46e45826e52a6cddfb95ca137abd",
"version": "12.2",
"port-version": 17
},
{
"git-tree": "7c75f4ea669ee37e510cb5d7ea0e39b0a7d3f6cb",
"version": "12.2",