Skip to content

preserve PKG_CONFIG_PATH instead of overwriting it #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berndpfrommer merged 1 commit into from
Mar 10, 2026
Merged

preserve PKG_CONFIG_PATH instead of overwriting it #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ set(FFMPEG_PKGCONFIG "" CACHE STRING "extra path to pkgconfig")
if("${FFMPEG_PKGCONFIG}" STREQUAL "")
else()
message(WARNING "using FFMPEG package from ${FFMPEG_PKGCONFIG}")
set(ENV{PKG_CONFIG_PATH} "${FFMPEG_PKGCONFIG}:$ENV{PKG_CONFIG_PATH}")
endif()

set(ENV{PKG_CONFIG_PATH} ${FFMPEG_PKGCONFIG})
find_package(PkgConfig REQUIRED)

pkg_check_modules(LIBAV REQUIRED IMPORTED_TARGET
Expand All @@ -51,21 +51,6 @@ pkg_check_modules(LIBAV REQUIRED IMPORTED_TARGET
libswscale
libavutil)


set(FFMPEG_PKGCONFIG "" CACHE STRING "extra path to pkgconfig")
if("${FFMPEG_PKGCONFIG}" STREQUAL "")
else()
message(WARNING "using FFMPEG package from ${FFMPEG_PKGCONFIG}")
endif()

set(ENV{PKG_CONFIG_PATH} ${FFMPEG_PKGCONFIG})
find_package(PkgConfig REQUIRED)
pkg_check_modules(LIBAV REQUIRED IMPORTED_TARGET
libavcodec
libswresample
libswscale
libavutil)

if(LIBAV_libavcodec_VERSION VERSION_GREATER_EQUAL 60.0.0)
add_definitions(-DUSE_AV_FLAGS)
endif()
Expand Down
4 changes: 3 additions & 1 deletion cmake/ffmpeg_encoder_decoder-extras.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
set(FFMPEG_PKGCONFIG "" CACHE STRING "extra path to pkgconfig")
set(ENV{PKG_CONFIG_PATH} ${FFMPEG_PKGCONFIG})
if(NOT "${FFMPEG_PKGCONFIG}" STREQUAL "")
set(ENV{PKG_CONFIG_PATH} "${FFMPEG_PKGCONFIG}:$ENV{PKG_CONFIG_PATH}")
endif()

find_package(PkgConfig REQUIRED)

Expand Down