aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLily <47812810+LilyWangL@users.noreply.github.com>2019-12-21 04:23:33 +0800
committerdan-shaw <51385773+dan-shaw@users.noreply.github.com>2019-12-20 12:23:33 -0800
commit0173bf09bd6dfad4ed74c4d9ac3a53dd33fbb59d (patch)
tree63b254c7d11d4de58d59350aafc24a3aaf0c56bb
parent0548f8a50c44a00ee463e6fe8eef7807078b5006 (diff)
downloadvcpkg-0173bf09bd6dfad4ed74c4d9ac3a53dd33fbb59d.tar.gz
vcpkg-0173bf09bd6dfad4ed74c4d9ac3a53dd33fbb59d.zip
[nanodbc] Fix link error 2019 (#9185)
-rw-r--r--ports/nanodbc/CONTROL2
-rw-r--r--ports/nanodbc/portfile.cmake6
2 files changed, 3 insertions, 5 deletions
diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL
index 20c7c28b5..1dd7cfef2 100644
--- a/ports/nanodbc/CONTROL
+++ b/ports/nanodbc/CONTROL
@@ -1,4 +1,4 @@
Source: nanodbc
-Version: 2.12.4-4
+Version: 2.12.4-5
Homepage: https://github.com/lexicalunit/nanodbc
Description: A small C++ wrapper for the native C ODBC API.
diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake
index 0b31d6f6f..0d903a060 100644
--- a/ports/nanodbc/portfile.cmake
+++ b/ports/nanodbc/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
# Only static libraries are supported.
# See https://github.com/nanodbc/nanodbc/issues/13
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
@@ -23,7 +21,7 @@ vcpkg_configure_cmake(
# /Legacy
-DNANODBC_DISABLE_EXAMPLES=ON
-DNANODBC_DISABLE_TESTS=ON
- -DNANODBC_ENABLE_UNICODE=ON
+ -DNANODBC_ENABLE_UNICODE=OFF
)
vcpkg_install_cmake()
@@ -33,4 +31,4 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
endif()
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/nanodbc RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)