[ffnvcodec] fix single config builds (#42442)

This commit is contained in:
Alexander Neumann 2024-12-16 19:52:32 +01:00 committed by GitHub
parent e303a7292b
commit 4474162f65
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 5 deletions

View File

@ -28,8 +28,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}
LOGNAME build-${TARGET_TRIPLET}
)
file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
if(NOT VCPKG_BUILD_TYPE)
file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
endif()
# Linux, etc.
else()
@ -47,11 +49,13 @@ else()
# FFmpeg uses pkgconfig to find ffnvcodec.pc, so install it where
# FFMpeg's call to pkgconfig expects to find it.
file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
if(NOT VCPKG_BUILD_TYPE)
file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
endif()
endif()
vcpkg_fixup_pkgconfig()
# Install the files to their default vcpkg locations
file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright")

View File

@ -1,6 +1,7 @@
{
"name": "ffnvcodec",
"version": "12.2.72.0",
"port-version": 1,
"description": "FFmpeg version of Nvidia Codec SDK headers.",
"homepage": "https://github.com/FFmpeg/nv-codec-headers",
"supports": "linux | (!osx & !uwp & !(arm64 & windows))"

View File

@ -2762,7 +2762,7 @@
},
"ffnvcodec": {
"baseline": "12.2.72.0",
"port-version": 0
"port-version": 1
},
"fftw3": {
"baseline": "3.3.10",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "90afa3238f852b5b9bc8fee3e259b3a0f0fee91d",
"version": "12.2.72.0",
"port-version": 1
},
{
"git-tree": "5cbb2a7f0ed07795c560971fddd1c6021c37fbfb",
"version": "12.2.72.0",