diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2021-10-14 05:41:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-13 14:41:53 -0700 |
| commit | 38502feb14e31c300f2f837633ee1824e003ff82 (patch) | |
| tree | ff04c6d34fdac07ae2e02b2dad235a4feb1d1499 | |
| parent | f1e18c43d7d341872467b7bc718dcba5d894fafb (diff) | |
| download | vcpkg-38502feb14e31c300f2f837633ee1824e003ff82.tar.gz vcpkg-38502feb14e31c300f2f837633ee1824e003ff82.zip | |
[nanodbc] Add missing include (#20668)
| -rw-r--r-- | ports/nanodbc/add-missing-include.patch | 12 | ||||
| -rw-r--r-- | ports/nanodbc/portfile.cmake | 19 | ||||
| -rw-r--r-- | ports/nanodbc/vcpkg.json | 10 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/n-/nanodbc.json | 5 |
5 files changed, 37 insertions, 11 deletions
diff --git a/ports/nanodbc/add-missing-include.patch b/ports/nanodbc/add-missing-include.patch new file mode 100644 index 000000000..2841c7d96 --- /dev/null +++ b/ports/nanodbc/add-missing-include.patch @@ -0,0 +1,12 @@ +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> + diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index dfdba7caa..7397bc75b 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -8,7 +8,9 @@ vcpkg_from_github( REF 7404a4dd7697e188df5724ab95a7553d2fc404eb # v2.13.0 SHA512 35ca098e783d771f3df611bce84e9b8207a6a5b72c492d2f3909977bc91a7c22bb262c34768b0d97ebfbdf12eeda0214064a8ea171e7bdda7b759f93ff346f45 HEAD_REF master - PATCHES rename-version.patch + PATCHES + rename-version.patch + add-missing-include.patch ) file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") @@ -16,9 +18,8 @@ if(DEFINED NANODBC_ODBC_VERSION) set(NANODBC_ODBC_VERSION -DNANODBC_ODBC_VERSION=${NANODBC_ODBC_VERSION}) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNANODBC_DISABLE_EXAMPLES=ON -DNANODBC_DISABLE_TESTS=ON @@ -26,13 +27,13 @@ vcpkg_configure_cmake( ${NANODBC_ODBC_VERSION} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nanodbc/vcpkg.json b/ports/nanodbc/vcpkg.json index d577f7e8a..bc62f207d 100644 --- a/ports/nanodbc/vcpkg.json +++ b/ports/nanodbc/vcpkg.json @@ -1,13 +1,21 @@ { "name": "nanodbc", "version": "2.13.0", - "port-version": 4, + "port-version": 5, "description": "A small C++ wrapper for the native C ODBC API.", "homepage": "https://github.com/nanodbc/nanodbc", "dependencies": [ { "name": "unixodbc", "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6197f1366..ca710e4a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4506,7 +4506,7 @@ }, "nanodbc": { "baseline": "2.13.0", - "port-version": 4 + "port-version": 5 }, "nanoflann": { "baseline": "1.3.2", diff --git a/versions/n-/nanodbc.json b/versions/n-/nanodbc.json index 28b825696..163962a43 100644 --- a/versions/n-/nanodbc.json +++ b/versions/n-/nanodbc.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "82bfc56de1430aa6fec9c27925d46a72e1b800a0", + "version": "2.13.0", + "port-version": 5 + }, + { "git-tree": "3549b9a15615f77ec718e9071309482707ad3779", "version": "2.13.0", "port-version": 4 |