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.

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

Fix: [CMake] libpng header/library mismatch for macos #8754

Merged
merged 1 commit into from Feb 27, 2021

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented Feb 27, 2021

Motivation / Problem

On macos, CMake find modules first search in Framework.
From CI vcpkg install

    libpng[core]:x64-osx -> 1.6.37#14

From CI cmake build

-- Found PNG: optimized;/usr/local/share/vcpkg/installed/x64-osx/debug/lib/libpng.a;debug;/usr/local/share/vcpkg/installed/x64-osx/debug/lib/libpng16d.a (found version "1.4.12") 

Description

Simply change search order so Framework are tested after user installed packages.

result

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@glx22 glx22 changed the title Fix: [CMake] incorrect libpng could be detected for macos Fix: [CMake] libpng header/library mismatch for macos Feb 27, 2021
LordAro
LordAro previously approved these changes Feb 27, 2021
@glx22 glx22 merged commit 54fb4c0 into OpenTTD:master Feb 27, 2021
@glx22 glx22 deleted the macos_wrong_png branch February 27, 2021 01:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants