Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[libftdi1] no absolute paths (#21705) 

* [libftdi1] no absolute paths

* [libusb] add pkgconfig file on windows

* [libftdi1] don't delete pkgconfig on windows

* add versions
This commit is contained in:
autoantwort 2021-12-02 04:21:52 +01:00 committed by GitHub
parent 77a6edf5f1
commit b9b15b4e2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libftdi1/portfile.cmake
View File

@ -36,6 +36,8 @@ vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libftdi1)
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

2
ports/libftdi1/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libftdi1",
"version": "1.5",
"port-version": 2,
"port-version": 3,
"description": "FTDI USB driver with bitbang mode",
"dependencies": [
"libconfuse",

28
ports/libusb/portfile.cmake
View File

@ -1,9 +1,9 @@
vcpkg_fail_port_install(ON_TARGET "uwp")
if(VCPKG_TARGET_IS_LINUX)
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 autoreconf libudev-dev")
endif()
set(VERSION 1.0.24)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libusb/libusb
@ -41,23 +41,33 @@ if(VCPKG_TARGET_IS_WINDOWS)
# The README.md file in the archive is a symlink to README
# which causes issues with the windows MSBUILD process
file(REMOVE ${SOURCE_PATH}/README.md)
file(REMOVE "${SOURCE_PATH}/README.md")
vcpkg_install_msbuild(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
PROJECT_SUBPATH msvc/libusb_${LIBUSB_PROJECT_TYPE}_${MSVS_VERSION}.vcxproj
LICENSE_SUBPATH COPYING
)
file(INSTALL ${SOURCE_PATH}/libusb/libusb.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/libusb-1.0)
file(INSTALL "${SOURCE_PATH}/libusb/libusb.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/libusb-1.0")
set(prefix "")
set(exec_prefix [[${prefix}]])
set(libdir [[${prefix}/lib]])
set(includedir [[${prefix}/include]])
configure_file("${SOURCE_PATH}/libusb-1.0.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libusb-1.0.pc" @ONLY)
if(NOT VCPKG_BUILD_TYPE)
set(includedir [[${prefix}/../include]])
configure_file("${SOURCE_PATH}/libusb-1.0.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libusb-1.0.pc" @ONLY)
endif()
else()
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
AUTOCONFIG
)
vcpkg_install_make()
vcpkg_fixup_pkgconfig()
endif()
configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY)
configure_file(${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_fixup_pkgconfig()
configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
configure_file("${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

2
ports/libusb/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libusb",
"version": "1.0.24",
"port-version": 6,
"port-version": 7,
"description": "a cross-platform library to access USB devices",
"homepage": "https://github.com/libusb/libusb",
"supports": "!uwp"

4
versions/baseline.json
View File

@ -3462,7 +3462,7 @@
},
"libftdi1": {
"baseline": "1.5",
"port-version": 2
"port-version": 3
},
"libgcrypt": {
"baseline": "1.9.4",
@ -4006,7 +4006,7 @@
},
"libusb": {
"baseline": "1.0.24",
"port-version": 6
"port-version": 7
},
"libusb-win32": {
"baseline": "1.2.6.0",

5
versions/l-/libftdi1.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bfed0e0f6e07e8ce7a94f47efbad9dde21f193c8",
"version": "1.5",
"port-version": 3
},
{
"git-tree": "412a93e6eef636e36b23774f3d132fe4df89d979",
"version": "1.5",

5
versions/l-/libusb.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "337aac12b9bf6aab68dd1375c3592f1575efbda9",
"version": "1.0.24",
"port-version": 7
},
{
"git-tree": "489d07fb5a6ada487532ea3cc5390a50e7feef02",
"version": "1.0.24",