diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-03-24 05:41:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 14:41:32 -0700 |
| commit | 9327b5c5bf11c44f7d80c3b0fe3ad708a49299c2 (patch) | |
| tree | b49d4490e316c07fdc46506bd57845508732444d | |
| parent | b35f1edc231f158a5d7f8b8df3b7d01e3c27eb0c (diff) | |
| download | vcpkg-9327b5c5bf11c44f7d80c3b0fe3ad708a49299c2.tar.gz vcpkg-9327b5c5bf11c44f7d80c3b0fe3ad708a49299c2.zip | |
[libusb] Fix the support for Visual Studio 2019 (#16839)
* [libusb] Fix the support for Visual Studio 2019
* Update versions
| -rw-r--r-- | ports/libusb/CONTROL | 6 | ||||
| -rw-r--r-- | ports/libusb/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/libusb/vcpkg.json | 8 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libusb.json | 5 |
5 files changed, 15 insertions, 8 deletions
diff --git a/ports/libusb/CONTROL b/ports/libusb/CONTROL deleted file mode 100644 index 0d57f8300..000000000 --- a/ports/libusb/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libusb -Version: 1.0.24 -Port-Version: 3 -Homepage: https://github.com/libusb/libusb -Description: a cross-platform library to access USB devices -Supports: !uwp diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index f6f972ae5..153dedf13 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_from_github( if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") - set(MSVS_VERSION 2017) #they are abi compatible, so it should work + set(MSVS_VERSION 2019) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") set(MSVS_VERSION 2017) else() diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json new file mode 100644 index 000000000..5649425e8 --- /dev/null +++ b/ports/libusb/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libusb", + "version": "1.0.24", + "port-version": 4, + "description": "a cross-platform library to access USB devices", + "homepage": "https://github.com/libusb/libusb", + "supports": "!uwp" +} diff --git a/versions/baseline.json b/versions/baseline.json index 0d7a50b31..b4f95458f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3510,7 +3510,7 @@ }, "libusb": { "baseline": "1.0.24", - "port-version": 3 + "port-version": 4 }, "libusb-win32": { "baseline": "1.2.6.0-6", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index 0d31a85f1..502a02100 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "0d77c2046af91be18e4af15b3a9b3e7f0024fa18", + "version": "1.0.24", + "port-version": 4 + }, + { "git-tree": "419808531bfc5a58d7581dc700a2560a3ab7265e", "version-string": "1.0.24", "port-version": 3 |