[soci] bump version (#5964)

This commit is contained in:
Erwan BERNARD 2019-04-09 08:54:58 +02:00 committed by Phil Christensen
parent c2790cd23e
commit cfe58912a8
4 changed files with 7 additions and 53 deletions

View File

@ -1,5 +1,5 @@
Source: soci
Version: 3.2.3-2
Version: 3.2.3-3
Description: SOCI database access library
Feature: boost

View File

@ -1,30 +0,0 @@
diff --git a/src/cmake/modules/FindPostgreSQL.cmake b/src/cmake/modules/FindPostgreSQL.cmake
index 8178418..6e15d5b 100644
--- a/src/cmake/modules/FindPostgreSQL.cmake
+++ b/src/cmake/modules/FindPostgreSQL.cmake
@@ -65,6 +65,25 @@ find_library(POSTGRESQL_LIBRARIES NAMES pq libpq
$ENV{ProgramFiles}/PostgreSQL/*/lib/ms
$ENV{SystemDrive}/PostgreSQL/*/lib/ms)
+find_library(POSTGRESQL_LIBRARIES_DEBUG NAMES pqd libpqd
+ PATHS
+ ${PG_CONFIG_LIBDIR}
+ /usr/lib
+ /usr/local/lib
+ /usr/lib/postgresql
+ /usr/lib64
+ /usr/local/lib64
+ /usr/lib64/postgresql
+ $ENV{ProgramFiles}/PostgreSQL/*/lib
+ $ENV{SystemDrive}/PostgreSQL/*/lib
+ $ENV{ProgramFiles}/PostgreSQL/*/lib/ms
+ $ENV{SystemDrive}/PostgreSQL/*/lib/ms)
+
+if(WIN32 AND POSTGRESQL_LIBRARIES AND POSTGRESQL_LIBRARIES_DEBUG)
+ set(POSTGRESQL_LIBRARIES optimized ${POSTGRESQL_LIBRARIES}
+ debug ${POSTGRESQL_LIBRARIES_DEBUG})
+endif()
+
if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES)
set(POSTGRESQL_FOUND TRUE)
else()

View File

@ -1,14 +0,0 @@
diff --git a/src/core/soci-platform.h b/src/core/soci-platform.h
index aa5e4b1..2d8c5c7 100644
--- a/src/core/soci-platform.h
+++ b/src/core/soci-platform.h
@@ -24,7 +24,9 @@
#endif
// Define if you have the snprintf variants.
+#if _MSC_VER < 1900
#define snprintf _snprintf
+#endif
// Define if you have the strtoll and strtoull variants.
#if _MSC_VER < 1300

View File

@ -2,11 +2,9 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO SOCI/soci
REF 3.2.3
SHA512 8c597b37efe82c85e6d951f66cb0f818d2c12cb673914bc7b322bc0a9da676e6c02f221c9104fb06d1b4b02fed4e5a4fb872dd3370b9117f248c3b948faf4fb3
REF c15b178a44b99ed3ff7fd953837fb97f6314abb7
SHA512 037c44f29e80b5ec57046606b4672088917d469e9d2254e3e15253e170026cf0fe17e4f79a4b01df22fe7032708ca87354b1560d9880d4d165cdef869c3c6081
HEAD_REF master
PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-define-snprintf.patch"
"${CMAKE_CURRENT_LIST_DIR}/find-libpqd.patch"
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC)
@ -29,7 +27,7 @@ foreach(_feature IN LISTS ALL_FEATURES)
endforeach()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/src
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DSOCI_TESTS=OFF
@ -48,10 +46,10 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake ${CURRENT_PACKAGES_DIR}/debug/cmake ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
file(COPY ${SOURCE_PATH}/src/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/soci)
file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/soci)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/soci/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/soci/copyright)
vcpkg_copy_pdbs()
vcpkg_copy_pdbs()