mirror of https://github.com/microsoft/vcpkg.git
[libpqxx] Update to 7.10.1 (#45607)
This commit is contained in:
Kai Pastor
GitHub
parent
89157a5744
commit
4091a2e994
|
|
@ -1,14 +0,0 @@
|
|||
/* System supports poll(). */
|
||||
#cmakedefine HAVE_POLL 1
|
||||
|
||||
/* Define to 1 if you have the <sys/select.h> header file. */
|
||||
#cmakedefine HAVE_SYS_SELECT_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/time.h> header file. */
|
||||
#cmakedefine HAVE_SYS_TIME_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#cmakedefine HAVE_SYS_TYPES_H 1
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#cmakedefine HAVE_UNISTD_H 1
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
/* Define if compiler supports [[deprecated]] attribute */
|
||||
#cmakedefine PQXX_HAVE_DEPRECATED 1
|
||||
|
||||
/* Define if the compiler supports std::experimental::optional. */
|
||||
#cmakedefine PQXX_HAVE_EXP_OPTIONAL 1
|
||||
|
||||
/* Define if the compiler supports std::optional. */
|
||||
#cmakedefine PQXX_HAVE_OPTIONAL 1
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
diff --git a/libpqxx.pc.in b/libpqxx.pc.in
|
||||
index eb7dcff4..8de4cdd8 100644
|
||||
--- a/libpqxx.pc.in
|
||||
+++ b/libpqxx.pc.in
|
||||
@@ -6,5 +6,6 @@ includedir=@includedir@
|
||||
Name: libpqxx
|
||||
Description: C++ client API for the PostgreSQL database management system.
|
||||
Version: @VERSION@
|
||||
+Requires.private: libpq
|
||||
Libs: -L${libdir} -lpqxx
|
||||
Cflags: -I${includedir}
|
||||
|
|
@ -2,15 +2,13 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO jtv/libpqxx
|
||||
REF "${VERSION}"
|
||||
SHA512 bc7fa622b48352b0bcc4d5a49e5b5c47c29e1863547d9f7652c300f324c8f3302c8ffc06d7c77b2ec562ef879ec6b22c96a74b0de7b03b8763f75d7806cb1eaf
|
||||
SHA512 065545fe93bd2f2904f27c891b7ef960b709b7021bbf978e82eeffddd2c7625b7da21a2239987215a0974918ddde5ff400913216a25ac6c590048afc8f309411
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix_build_with_vs2017.patch
|
||||
pkgconfig.diff
|
||||
)
|
||||
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in" DESTINATION "${SOURCE_PATH}")
|
||||
file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-internal-compiler.h.in" DESTINATION "${SOURCE_PATH}")
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
|
|
@ -19,10 +17,15 @@ vcpkg_cmake_configure(
|
|||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpqxx)
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
||||
# Not module from libpq
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
|
||||
else()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
{
|
||||
"name": "libpqxx",
|
||||
"version": "7.10.0",
|
||||
"description": "The official C++ client API for PostgreSQL",
|
||||
"homepage": "https://www.postgresql.org/",
|
||||
"version": "7.10.1",
|
||||
"description": [
|
||||
"The official* C++ client API for PostgreSQL.",
|
||||
"*) NB https://pqxx.org/libpqxx/faq/"
|
||||
],
|
||||
"homepage": "https://pqxx.org/libpqxx/",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
|
||||
vcpkg_find_acquire_program(PKGCONFIG)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${CURRENT_PORT_DIR}/project"
|
||||
OPTIONS
|
||||
"-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}"
|
||||
)
|
||||
vcpkg_cmake_build()
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
cmake_minimum_required(VERSION 3.30)
|
||||
project(libpqxx-test CXX)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
|
||||
find_package(libpqxx CONFIG REQUIRED)
|
||||
|
||||
add_executable(main main.cpp)
|
||||
target_link_libraries(main PRIVATE libpqxx::pqxx)
|
||||
|
||||
if(NOT (WIN32 AND NOT MINGW))
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(libpqxx IMPORTED_TARGET REQUIRED libpqxx)
|
||||
|
||||
add_executable(main-pkgconfig main.cpp)
|
||||
target_link_libraries(main-pkgconfig PRIVATE PkgConfig::libpqxx)
|
||||
endif()
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
#include <pqxx/pqxx>
|
||||
|
||||
int main()
|
||||
{
|
||||
pqxx::connection cx{"postgresql://vcpkg@localhost/tests"};
|
||||
pqxx::work tx{cx};
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"name": "vcpkg-ci-libpqxx",
|
||||
"version-string": "ci",
|
||||
"description": "Validates libpqxx",
|
||||
"dependencies": [
|
||||
"libpqxx",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -5157,7 +5157,7 @@
|
|||
"port-version": 1
|
||||
},
|
||||
"libpqxx": {
|
||||
"baseline": "7.10.0",
|
||||
"baseline": "7.10.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"libprotobuf-mutator": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a8ab2aa6bebde688f70c8e83066b7f41fb93dbf3",
|
||||
"version": "7.10.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "a1e988750bfa79648a00ac3c6a211a956a8cc237",
|
||||
"version": "7.10.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue