[avcpp] Install pkgconfig into the correct location. (#21046)

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

View File

@ -0,0 +1,13 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e0104f4..dae0942 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -128,7 +128,7 @@ if (AVCPP_NOT_SUBPROJECT)
)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libavcpp.pc"
- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig")
+ DESTINATION "lib/pkgconfig")
endif()
endif()

View File

@ -9,26 +9,29 @@ vcpkg_from_github(
HEAD_REF master HEAD_REF master
PATCHES PATCHES
0002-av_init_packet_deprecation.patch 0002-av_init_packet_deprecation.patch
fix-pkgconfig-location.patch
) )
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED)
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
-DAV_ENABLE_STATIC=${AVCPP_ENABLE_STATIC} "-DAV_ENABLE_STATIC=${AVCPP_ENABLE_STATIC}"
-DAV_ENABLE_SHARED=${AVCPP_ENABLE_SHARED} "-DAV_ENABLE_SHARED=${AVCPP_ENABLE_SHARED}"
-DAV_BUILD_EXAMPLES=OFF -DAV_BUILD_EXAMPLES=OFF
-DBUILD_TESTING=OFF -DBUILD_TESTING=OFF
) )
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()

View File

@ -1,6 +1,7 @@
{ {
"name": "avcpp", "name": "avcpp",
"version-date": "2021-06-14", "version-date": "2021-06-14",
"port-version": 1,
"description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.", "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.",
"homepage": "https://github.com/h4tr3d/avcpp", "homepage": "https://github.com/h4tr3d/avcpp",
"dependencies": [ "dependencies": [
@ -12,6 +13,7 @@
"avdevice", "avdevice",
"avfilter", "avfilter",
"avformat", "avformat",
"postproc",
"swresample", "swresample",
"swscale" "swscale"
] ]

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "caf5460d5bfca1d608b7c7eab2bd2872080bf0d8",
"version-date": "2021-06-14",
"port-version": 1
},
{ {
"git-tree": "b4e6dcc1706046f3b2b6fca62df98bbc7696eb19", "git-tree": "b4e6dcc1706046f3b2b6fca62df98bbc7696eb19",
"version-date": "2021-06-14", "version-date": "2021-06-14",

View File

@ -242,7 +242,7 @@
}, },
"avcpp": { "avcpp": {
"baseline": "2021-06-14", "baseline": "2021-06-14",
"port-version": 0 "port-version": 1
}, },
"avisynthplus": { "avisynthplus": {
"baseline": "3.7.0", "baseline": "3.7.0",