Skip to content

Commit 4474162

Browse files
authored
[ffnvcodec] fix single config builds (microsoft#42442)
1 parent e303a72 commit 4474162

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

ports/ffnvcodec/portfile.cmake

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ if(VCPKG_TARGET_IS_WINDOWS)
2828
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}
2929
LOGNAME build-${TARGET_TRIPLET}
3030
)
31-
32-
file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
31+
32+
if(NOT VCPKG_BUILD_TYPE)
33+
file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
34+
endif()
3335

3436
# Linux, etc.
3537
else()
@@ -47,11 +49,13 @@ else()
4749
# FFmpeg uses pkgconfig to find ffnvcodec.pc, so install it where
4850
# FFMpeg's call to pkgconfig expects to find it.
4951
file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
50-
file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
52+
if(NOT VCPKG_BUILD_TYPE)
53+
file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
54+
endif()
5155
endif()
5256

5357
vcpkg_fixup_pkgconfig()
5458

5559
# Install the files to their default vcpkg locations
5660
file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
57-
file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
61+
vcpkg_install_copyright(FILE_LIST "${CURRENT_PORT_DIR}/copyright")

ports/ffnvcodec/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "ffnvcodec",
33
"version": "12.2.72.0",
4+
"port-version": 1,
45
"description": "FFmpeg version of Nvidia Codec SDK headers.",
56
"homepage": "https://github.com/FFmpeg/nv-codec-headers",
67
"supports": "linux | (!osx & !uwp & !(arm64 & windows))"

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2762,7 +2762,7 @@
27622762
},
27632763
"ffnvcodec": {
27642764
"baseline": "12.2.72.0",
2765-
"port-version": 0
2765+
"port-version": 1
27662766
},
27672767
"fftw3": {
27682768
"baseline": "3.3.10",

versions/f-/ffnvcodec.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": "90afa3238f852b5b9bc8fee3e259b3a0f0fee91d",
5+
"version": "12.2.72.0",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "5cbb2a7f0ed07795c560971fddd1c6021c37fbfb",
510
"version": "12.2.72.0",

0 commit comments

Comments
 (0)