Skip to content

Commit 3d4f489

Browse files
authored
[libusb] Switch to vcpkg-make (microsoft#45911)
1 parent a80d331 commit 3d4f489

6 files changed

Lines changed: 17 additions & 17 deletions

File tree

ports/libusb/portfile.cmake

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
if(VCPKG_TARGET_IS_LINUX)
2-
message("${PORT} currently requires the following tools and libraries from the system package manager:\n autoreconf\n libudev\n\nThese can be installed on Ubuntu systems via apt-get install autoconf libudev-dev")
1+
if("udev" IN_LIST FEATURES)
2+
message("${PORT} currently requires the following tools and libraries from the system package manager:\n libudev\n\nThese can be installed on Ubuntu systems via apt-get install libudev-dev")
33
endif()
44

55
vcpkg_from_github(
@@ -42,24 +42,21 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
4242
else()
4343
vcpkg_list(SET MAKE_OPTIONS)
4444
vcpkg_list(SET LIBUSB_LINK_LIBRARIES)
45-
if(VCPKG_TARGET_IS_EMSCRIPTEN)
46-
vcpkg_list(APPEND MAKE_OPTIONS BUILD_TRIPLET --host=wasm32)
47-
endif()
4845
if("udev" IN_LIST FEATURES)
4946
vcpkg_list(APPEND MAKE_OPTIONS "--enable-udev")
5047
vcpkg_list(APPEND LIBUSB_LINK_LIBRARIES udev)
5148
else()
5249
vcpkg_list(APPEND MAKE_OPTIONS "--disable-udev")
5350
endif()
54-
vcpkg_configure_make(
51+
vcpkg_make_configure(
5552
SOURCE_PATH "${SOURCE_PATH}"
56-
AUTOCONFIG
53+
AUTORECONF
5754
OPTIONS
5855
${MAKE_OPTIONS}
5956
"--enable-examples-build=no"
6057
"--enable-tests-build=no"
6158
)
62-
vcpkg_install_make()
59+
vcpkg_make_install()
6360
endif()
6461

6562
vcpkg_fixup_pkgconfig()
@@ -70,5 +67,4 @@ if(NOT VCPKG_BUILD_TYPE)
7067
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libusb-1.0.pc" " -Wl,-framework," " -framework " IGNORE_UNCHANGED)
7168
endif()
7269

73-
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
7470
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")

ports/libusb/usage

Lines changed: 0 additions & 5 deletions
This file was deleted.

ports/libusb/vcpkg.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
{
22
"name": "libusb",
33
"version": "1.0.29",
4+
"port-version": 1,
45
"description": "a cross-platform library to access USB devices",
56
"homepage": "https://github.com/libusb/libusb",
67
"license": "LGPL-2.1-or-later",
78
"supports": "!uwp",
89
"dependencies": [
10+
{
11+
"name": "vcpkg-make",
12+
"host": true,
13+
"platform": "!windows | mingw"
14+
},
915
{
1016
"name": "vcpkg-msbuild",
1117
"host": true,

scripts/ci.feature.baseline.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,6 @@ libtins:arm-uwp=fail
248248
libtins:x64-uwp=fail
249249
libtomcrypt:arm-uwp=fail
250250
libtomcrypt:arm64-windows=fail
251-
libusb:arm-uwp=fail
252-
libusb:x64-uwp=fail
253251
libusb-win32:arm-uwp=fail
254252
libusb-win32:x64-linux=fail
255253
libusb-win32:x64-osx=fail

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5478,7 +5478,7 @@
54785478
},
54795479
"libusb": {
54805480
"baseline": "1.0.29",
5481-
"port-version": 0
5481+
"port-version": 1
54825482
},
54835483
"libusb-win32": {
54845484
"baseline": "1.2.6.0",

versions/l-/libusb.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "9597176baa90f8f43c1b1b51d4e6822865716bfc",
5+
"version": "1.0.29",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "ee65ce9b463af39d68d6935078ce2e1e1e7084bc",
510
"version": "1.0.29",

0 commit comments

Comments
 (0)