Skip to content

Q&D patch for the multilib fix on N41/F41 #4733

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

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

Q&D patch for the multilib fix on N41/F41 #4733

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
056929b
Q&D patch for the multilib fix on N41/F41
1div0 May 1, 2025
a19010b
Merge branch 'AcademySoftwareFoundation:main' into HEIF
1div0 Aug 5, 2025
f1cb406
Merge branch 'AcademySoftwareFoundation:main' into HEIF
1div0 Aug 7, 2025
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
4 changes: 2 additions & 2 deletions src/cmake/modules/FindLibheif.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
include (FindPackageHandleStandardArgs)

find_path (LIBHEIF_INCLUDE_DIR
libheif/heif_version.h
libheif/heif_version-64.h
Copy link
Collaborator

@lgritz lgritz May 1, 2025

Choose a reason for hiding this comment

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

Suggested change
libheif/heif_version-64.h
NAMES libheif/heif_version.h libheif/heif_version-64.h

According to cmake docs, you can give several names to try.

HINTS
${LIBHEIF_INCLUDE_PATH}
ENV LIBHEIF_INCLUDE_PATH
Expand All @@ -30,7 +30,7 @@ find_library (LIBHEIF_LIBRARY heif
DOC "The directory where libheif libraries reside")

if (LIBHEIF_INCLUDE_DIR)
file(STRINGS "${LIBHEIF_INCLUDE_DIR}/libheif/heif_version.h" TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$")
file(STRINGS "${LIBHEIF_INCLUDE_DIR}/libheif/heif_version-64.h" TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$")
Copy link
Collaborator

@lgritz lgritz May 1, 2025

Choose a reason for hiding this comment

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

I think you'll want something like

    if (EXISTS name_choice_1)
        set (heif_header name_choice_1)
    else if (EXISTS name_choice_2)
        set (heif_header name_choice_2)
    endif ()
    file(STRINGS ${heif_header_name} TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$")

string(REGEX MATCHALL "[0-9.]+" LIBHEIF_VERSION ${TMP})
endif ()

Expand Down
Loading