aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Toussay <samuel@askia.com>2021-03-26 23:56:50 +0100
committerGitHub <noreply@github.com>2021-03-26 15:56:50 -0700
commite814436c12d1df0b401bbecd5360aaad3dd3078a (patch)
tree3c32b15f4783865743fcd96319f58b1e027c6f85
parenta9ba425534cda2791059f201c5edce77b580a985 (diff)
downloadvcpkg-e814436c12d1df0b401bbecd5360aaad3dd3078a.tar.gz
vcpkg-e814436c12d1df0b401bbecd5360aaad3dd3078a.zip
Nanodbc/fix/config cmake files path linux (#16045)
* [nanodbc] Fix CMake config files install path on Linux * [nanodbc] Update port version Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
-rw-r--r--ports/nanodbc/CONTROL1
-rw-r--r--ports/nanodbc/portfile.cmake2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/n-/nanodbc.json5
4 files changed, 8 insertions, 2 deletions
diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL
index 16a8ff83b..6903ada85 100644
--- a/ports/nanodbc/CONTROL
+++ b/ports/nanodbc/CONTROL
@@ -1,5 +1,6 @@
Source: nanodbc
Version: 2.13.0
+Port-Version: 2
Homepage: https://github.com/lexicalunit/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 eba375813..da2cba0cd 100644
--- a/ports/nanodbc/portfile.cmake
+++ b/ports/nanodbc/portfile.cmake
@@ -25,7 +25,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
else()
- vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
+ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/versions/baseline.json b/versions/baseline.json
index ba5821aeb..8448a3822 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4070,7 +4070,7 @@
},
"nanodbc": {
"baseline": "2.13.0",
- "port-version": 0
+ "port-version": 2
},
"nanoflann": {
"baseline": "1.3.1",
diff --git a/versions/n-/nanodbc.json b/versions/n-/nanodbc.json
index 692b2b0a4..5000badb1 100644
--- a/versions/n-/nanodbc.json
+++ b/versions/n-/nanodbc.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "4610c5bd3b7d399b683bea63cb00fe277bbcb3f8",
+ "version-string": "2.13.0",
+ "port-version": 2
+ },
+ {
"git-tree": "921e300d4f37f15072f30eaaf382d2d27f598ac6",
"version-string": "2.13.0",
"port-version": 0