Skip to content
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

pkgconf: Add private libraries in Requires.private for static linking #1905

Merged
merged 1 commit into from
Dec 28, 2023
+8 −0
Merged

pkgconf: Add private libraries in Requires.private for static linking #1905

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
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ option(AVIF_ENABLE_EXPERIMENTAL_GAIN_MAP
)
option(AVIF_ENABLE_EXPERIMENTAL_AVIR "Enable experimental reduced header" OFF)

set(AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE "")

function(set_local_or_system_option VAR DEFAULT TEXT)
# Deal with the older way of setting options.
if(DEFINED AVIF_LOCAL_${VAR})
Expand Down Expand Up @@ -226,6 +228,7 @@ set_local_or_system_option("LIBSHARPYUV" "OFF" "Use libsharpyuv.")
check_avif_option(AVIF_LIBSHARPYUV TARGET sharpyuv::sharpyuv PKG_NAME libsharpyuv)
if(AVIF_LIBSHARPYUV_ENABLED)
message(STATUS "libavif: libsharpyuv found; sharp rgb to yuv conversion enabled.")
set(AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE "${AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE} libsharpyuv")
target_compile_definitions(avif_obj PRIVATE -DAVIF_LIBSHARPYUV_ENABLED=1)
avif_target_link_library(sharpyuv::sharpyuv)
endif(AVIF_LIBSHARPYUV_ENABLED)
Expand Down Expand Up @@ -427,6 +430,7 @@ if(AVIF_CODEC_DAV1D_ENABLED)
avif_target_link_library(dav1d::dav1d)

message(STATUS "libavif: Codec enabled: dav1d (decode)")
set(AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE "${AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE} dav1d")
endif()

check_avif_option(AVIF_CODEC_LIBGAV1 TARGET libgav1::libgav1 PKG_NAME libgav1)
Expand All @@ -453,6 +457,7 @@ if(AVIF_CODEC_RAV1E_ENABLED)
avif_target_link_library(rav1e::rav1e)

message(STATUS "libavif: Codec enabled: rav1e (encode)")
set(AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE "${AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE} rav1e")
endif()

check_avif_option(AVIF_CODEC_SVT TARGET SvtAv1Enc PKG_NAME svt)
Expand All @@ -462,6 +467,7 @@ if(AVIF_CODEC_SVT_ENABLED)
avif_target_link_library(SvtAv1Enc)

message(STATUS "libavif: Codec enabled: svt (encode)")
set(AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE "${AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE} SvtAv1Enc")
endif()

check_avif_option(AVIF_CODEC_AOM TARGET aom PKG_NAME aom)
Expand All @@ -487,6 +493,7 @@ if(AVIF_CODEC_AOM_ENABLED)
avif_target_link_library(aom)

message(STATUS "libavif: Codec enabled: aom (${AVIF_CODEC_AOM_ENCODE_DECODE_CONFIG})")
set(AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE "${AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE} aom")
endif()

check_avif_option(AVIF_CODEC_AVM TARGET aom PKG_NAME avm)
Expand Down
1 change: 1 addition & 0 deletions libavif.pc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ Version: @PROJECT_VERSION@
Libs: -L${libdir} -lavif
Cflags: -I${includedir}@AVIF_PKG_CONFIG_EXTRA_CFLAGS@
Cflags.private: -UAVIF_DLL
Requires.private:@AVIF_PKG_CONFIG_EXTRA_REQUIRES_PRIVATE@
Loading