[libftdi] Install pkgconfig in the correct location. (#21045)

This commit is contained in:
Billy O'Neal 2021-10-28 18:11:06 -07:00 committed by GitHub
parent cf7cca5fcc
commit b963638b5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 8 deletions

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b68de29..2eda29e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
SET(LIB_SUFFIX "")
SET(PACK_ARCH "")
ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
- SET(LIB_SUFFIX 64)
+ SET(LIB_SUFFIX "")
SET(PACK_ARCH .x86_64)
endif(CMAKE_SIZEOF_VOID_P EQUAL 4)

View File

@ -11,12 +11,13 @@ vcpkg_extract_source_archive_ex(
PATCHES PATCHES
libusb-win32.patch libusb-win32.patch
shared-static.patch shared-static.patch
dont_use_lib64.patch
) )
file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}/src) file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}/src")
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA PREFER_NINJA
OPTIONS OPTIONS
-DDOCUMENTATION=OFF -DDOCUMENTATION=OFF
@ -27,16 +28,23 @@ vcpkg_configure_cmake(
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
-DLIBUSB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include "-DLIBUSB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include"
-DLIB_INSTALL_DIR=lib
) )
vcpkg_install_cmake() vcpkg_install_cmake()
vcpkg_fixup_cmake_targets() vcpkg_fixup_cmake_targets()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_fixup_pkgconfig()
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libftdi) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
file(RENAME ${CURRENT_PACKAGES_DIR}/share/libftdi/LICENSE ${CURRENT_PACKAGES_DIR}/share/libftdi/copyright)
file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libftdi")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/libftdi/LICENSE" "${CURRENT_PACKAGES_DIR}/share/libftdi/copyright")
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
# Delete pkgconfig files for ftdipp since we did -DFTDIPP=OFF above
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ftdipp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ftdipp.pc")

View File

@ -1,7 +1,7 @@
{ {
"name": "libftdi", "name": "libftdi",
"version-string": "0.20", "version-string": "0.20",
"port-version": 2, "port-version": 3,
"description": "FTDI USB driver with bitbang mode (v0.20)", "description": "FTDI USB driver with bitbang mode (v0.20)",
"dependencies": [ "dependencies": [
"libusb-win32" "libusb-win32"

View File

@ -3426,7 +3426,7 @@
}, },
"libftdi": { "libftdi": {
"baseline": "0.20", "baseline": "0.20",
"port-version": 2 "port-version": 3
}, },
"libftdi1": { "libftdi1": {
"baseline": "1.5", "baseline": "1.5",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "d9ba20048c2bbea3f1155e42faad0ab3b8a7e3f2",
"version-string": "0.20",
"port-version": 3
},
{ {
"git-tree": "432b2ffb3de6957b3569862e61d431171c916624", "git-tree": "432b2ffb3de6957b3569862e61d431171c916624",
"version-string": "0.20", "version-string": "0.20",