mirror of https://github.com/microsoft/vcpkg.git
[nanodbc] Update to 2.14.0 (#52758)
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
This commit is contained in:
parent
59681d9932
commit
dd15724168
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/nanodbc/nanodbc.cpp b/nanodbc/nanodbc.cpp
|
||||
index e6ca73f..3ad724a 100644
|
||||
--- a/nanodbc/nanodbc.cpp
|
||||
+++ b/nanodbc/nanodbc.cpp
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <cstring>
|
||||
#include <ctime>
|
||||
#include <iomanip>
|
||||
+#include <limits>
|
||||
#include <map>
|
||||
#include <type_traits>
|
||||
|
||||
|
|
@ -6,8 +6,8 @@ index 1ce7232..57836fe 100644
|
|||
message(STATUS "nanodbc compile: C++${CMAKE_CXX_STANDARD}")
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wnarrowing -Werror")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wnarrowing")
|
||||
include(CheckCXXCompilerFlag)
|
||||
|
||||
if (NANODBC_ENABLE_COVERAGE)
|
||||
|
|
|
|||
|
|
@ -5,16 +5,13 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO nanodbc/nanodbc
|
||||
REF 7404a4dd7697e188df5724ab95a7553d2fc404eb # v2.13.0
|
||||
SHA512 35ca098e783d771f3df611bce84e9b8207a6a5b72c492d2f3909977bc91a7c22bb262c34768b0d97ebfbdf12eeda0214064a8ea171e7bdda7b759f93ff346f45
|
||||
REF 1f7279111c013388509bab4bd0865a929ad02998 # v2.14.0
|
||||
SHA512 e71ec290b0f51963a0faa45b92ebfb3409ae27389e4a0cb8bf6616ec40db41f74e3e45668cf8ee852e0a456fbd5d495092d6c337a24ee7b5b6cb0aea496034b6
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
rename-version.patch
|
||||
add-missing-include.patch
|
||||
find-unixodbc.patch
|
||||
no-werror.patch
|
||||
)
|
||||
file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
|
||||
|
||||
if(DEFINED NANODBC_ODBC_VERSION)
|
||||
set(NANODBC_ODBC_VERSION -DNANODBC_ODBC_VERSION=${NANODBC_ODBC_VERSION})
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,8 +20,8 @@
|
||||
########################################
|
||||
## nanodbc version
|
||||
########################################
|
||||
-file(STRINGS VERSION NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+")
|
||||
+file(STRINGS "VERSION.txt" NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+")
|
||||
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" NANODBC_VERSION_MAJOR "${NANODBC_VERSION}")
|
||||
string(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" NANODBC_VERSION_MINOR "${NANODBC_VERSION}")
|
||||
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" NANODBC_VERSION_PATCH "${NANODBC_VERSION}")
|
||||
message(STATUS "nanodbc version: ${NANODBC_VERSION}")
|
||||
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"name": "nanodbc",
|
||||
"version": "2.13.0",
|
||||
"port-version": 8,
|
||||
"version": "2.14.0",
|
||||
"description": "A small C++ wrapper for the native C ODBC API.",
|
||||
"homepage": "https://github.com/nanodbc/nanodbc",
|
||||
"license": "MIT",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6913,8 +6913,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"nanodbc": {
|
||||
"baseline": "2.13.0",
|
||||
"port-version": 8
|
||||
"baseline": "2.14.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"nanoflann": {
|
||||
"baseline": "1.10.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "a3e66f9b35ec261ca57c2b4d8c7238358449430a",
|
||||
"version": "2.14.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "47782a521b53acaa6ee44a2956a2e98d17a20e50",
|
||||
"version": "2.13.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue