diff options
| author | Anthony Calandra <AnthonyCalandra@users.noreply.github.com> | 2021-07-23 01:38:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 22:38:59 -0700 |
| commit | 7a985e56bfc2675d20d21c8e1adfb8432153d522 (patch) | |
| tree | 7a9a4038097ef4da1b223479e9fa6bd8497bf0f3 | |
| parent | 05177765880ad317c9589dc87717ac8755fefaa2 (diff) | |
| download | vcpkg-7a985e56bfc2675d20d21c8e1adfb8432153d522.tar.gz vcpkg-7a985e56bfc2675d20d21c8e1adfb8432153d522.zip | |
Allow specifing the ODBC version for nanodbc. (#17974)
| -rw-r--r-- | ports/nanodbc/CONTROL | 4 | ||||
| -rw-r--r-- | ports/nanodbc/portfile.cmake | 7 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/n-/nanodbc.json | 5 |
4 files changed, 14 insertions, 4 deletions
diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL index 6903ada85..339e21251 100644 --- a/ports/nanodbc/CONTROL +++ b/ports/nanodbc/CONTROL @@ -1,6 +1,6 @@ Source: nanodbc Version: 2.13.0 -Port-Version: 2 -Homepage: https://github.com/lexicalunit/nanodbc +Port-Version: 3 +Homepage: https://github.com/nanodbc/nanodbc Description: A small C++ wrapper for the native C ODBC API. Build-Depends: unixodbc(!windows) diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index da2cba0cd..94ffb0893 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -1,7 +1,7 @@ # Only static libraries are supported. # See https://github.com/nanodbc/nanodbc/issues/13 vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanodbc/nanodbc @@ -10,6 +10,10 @@ vcpkg_from_github( HEAD_REF master ) +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 @@ -17,6 +21,7 @@ vcpkg_configure_cmake( -DNANODBC_DISABLE_EXAMPLES=ON -DNANODBC_DISABLE_TESTS=ON -DNANODBC_ENABLE_UNICODE=OFF + ${NANODBC_ODBC_VERSION} ) vcpkg_install_cmake() diff --git a/versions/baseline.json b/versions/baseline.json index 6bddefd81..a74e70abc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4278,7 +4278,7 @@ }, "nanodbc": { "baseline": "2.13.0", - "port-version": 2 + "port-version": 3 }, "nanoflann": { "baseline": "1.3.1", diff --git a/versions/n-/nanodbc.json b/versions/n-/nanodbc.json index 5000badb1..d5a9e7b9d 100644 --- a/versions/n-/nanodbc.json +++ b/versions/n-/nanodbc.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "2c22ba3957ee9a1a2c6d893c746b6a51bf38435c", + "version-string": "2.13.0", + "port-version": 3 + }, + { "git-tree": "4610c5bd3b7d399b683bea63cb00fe277bbcb3f8", "version-string": "2.13.0", "port-version": 2 |