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

Merge static libraries in avif_apps #2153

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Merge static libraries in avif_apps #2153

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90a64b3
Merge static libraries in avif_apps
vrabaud May 7, 2024
f7c19d2
Fix includes
vrabaud May 7, 2024
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
8 changes: 4 additions & 4 deletions cmake/Modules/merge_static_libs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ function(merge_static_libs target in_target)
if(link_dirs)
target_link_directories(${target} PUBLIC ${link_dirs})
endif()
get_target_property(include_dirs ${lib} INTERFACE_INCLUDE_DIRECTORIES)
if(include_dirs)
target_include_directories(${target} PUBLIC ${include_dirs})
endif()
get_target_property(is_avif_local ${lib} AVIF_LOCAL)
if(is_avif_local)
list(APPEND libs $<TARGET_FILE:${lib}>)
list(APPEND dependencies "${lib}")
else()
if(${child_target_type} STREQUAL "UNKNOWN_LIBRARY")
# This is a global library. It needs to be linked to.
get_target_property(include_dirs ${lib} INTERFACE_INCLUDE_DIRECTORIES)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I suggest not separaring the comment from the code (line 81: target_link_libraries(${target} ${lib})) that it describes.

if(include_dirs)
target_include_directories(${target} PUBLIC ${include_dirs})
endif()
target_link_libraries(${target} ${lib})
endif()
endif()
Expand Down
Loading