diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2021-06-09 23:25:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 15:25:20 -0700 |
| commit | 1d6e1be7ac3b4535f178d24d53e6eeee6ba674e1 (patch) | |
| tree | fe1f1a36c6abfbccb3d9a6e1d5edcedccbfe74c5 /ports/vcpkg-pkgconfig-get-modules | |
| parent | 17378cf96bb74ec1fb59838fc7a30c281bbc29bb (diff) | |
| download | vcpkg-1d6e1be7ac3b4535f178d24d53e6eeee6ba674e1.tar.gz vcpkg-1d6e1be7ac3b4535f178d24d53e6eeee6ba674e1.zip | |
[ffmpeg] use pkgconfig to get system dependencies for cmake (#17985)
* [ffmpeg] use ffbuild/config.mak to get dependencies
* [ffmpeg] bump port version
* [ffmpeg] x-add-version
* [ffmpeg] fix dependency issue on x64-linux
* [ffmpeg] x-add-version
* [ffmpeg] link order fix on linux
* [ffmpeg] x-add-version
* [ffmpeg] bump port version
* [ffmpeg] x-add-version
* [ffmpeg] exclude -lgcc and -lgcc_s (causes issues on azure for unknown reasons)
* [ffmpeg] x-add-version
* [ffmpeg] handle -lgcc and -lgcc_s appropriately
* [ffmpeg] x-add-version
* [ffmpeg] use x_vcpkg_pkgconfig_get_modules to get info, added some more fixes to generated for pkgconfig files
* [ffmpeg] report dependencies (for now, helps debugging)
* [vcpkg-pkgconfig-get-modules] bump port version
* [ffmpeg] [vcpkg-pkgconfig-get-modules] x-add-version
* [ffmpeg] fix variant issue
* [ffmpeg] x-add-version
* [ffmpeg] reformat manifest
* [ffmpeg] x-add-version
* [ffmpeg] remove duplicate avfilter library from dependencies
* [ffmpeg] fix -pthread / -pthreads on linux
* [ffmpeg] x-add-version
* [ffmpeg] fix dynamic builds when no libraries need to be linked
* [ffmpeg] x-add-version
* [ffmpeg] disable openh264 on uwp when building all
* [ffmpeg] x-add-version
* [avcpp] fix uwp build failure due to deprecations treated as errors
* [avcpp] bump port version
* [avcpp] x-add-version
* [avcpp] smaller patch
* [avcpp] x-add-version
* [ffmpeg] x-add-version
Diffstat (limited to 'ports/vcpkg-pkgconfig-get-modules')
| -rw-r--r-- | ports/vcpkg-pkgconfig-get-modules/vcpkg.json | 3 | ||||
| -rw-r--r-- | ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json index f9c24c7f3..3098b94f3 100644 --- a/ports/vcpkg-pkgconfig-get-modules/vcpkg.json +++ b/ports/vcpkg-pkgconfig-get-modules/vcpkg.json @@ -1,4 +1,5 @@ { "name": "vcpkg-pkgconfig-get-modules", - "version-date": "2021-04-02" + "version-date": "2021-04-02", + "port-version": 1 } diff --git a/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake b/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake index 43ccf92e7..cfe417be0 100644 --- a/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake +++ b/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake @@ -61,7 +61,7 @@ function(x_vcpkg_pkgconfig_get_modules) set(var_suffixes)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
- z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}")
+ z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/lib/pkgconfig${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}")
if(arg_LIBS)
execute_process(
COMMAND "${PKGCONFIG}" --libs ${arg_MODULES}
@@ -96,7 +96,7 @@ function(x_vcpkg_pkgconfig_get_modules) endif()
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
- z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}")
+ z_vcpkg_set_pkgconfig_path("${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" "${backup_PKG_CONFIG_PATH}")
if(arg_LIBS)
execute_process(
COMMAND "${PKGCONFIG}" --libs ${arg_MODULES}
|