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

CMake: Actually use the include directories specified by dependencies #10936

Merged
merged 2 commits into from Jan 30, 2023

Conversation

TellowKrinkle
Copy link
Contributor

Some users were struggling to build the Mac build of dolphin because Homebrew had installed a header-less version of the zstd library with Qt and were getting compilation errors that were difficult to track down.

Homebrew does not install header-less versions of zstd. You just need to use the include directory returned by pkg-config to find them.

For LZMA, macOS does include a headerless dylib, but FindLibLZMA searches for the header and marks LZMA as not found unless the header is also found. Once again, the issue was us ignoring the required include directories.

Note: Before merging, we should make sure buildbot builds still run on older macOSes, since this could affect what system libraries get used, and Homebrew libs are not compiled with backwards compatibility enabled

@pizuz
Copy link

pizuz commented Aug 2, 2022

Working on macOS 10.15.7 Catalina. Is this old enough? ;)

@OatmealDome
Copy link
Member

Our oldest supported OS is Mojave.

@AdmiralCurtiss
Copy link
Contributor

find_package(LibLZMA) only defines a target as of CMake version 3.14 (according to the documentation anyway) but our minimum is 3.13.

@TellowKrinkle
Copy link
Contributor Author

find_package(LibLZMA) only defines a target as of CMake version 3.14 (according to the documentation anyway) but our minimum is 3.13.

Should be fixed

Tested on 10.14.6, launches fine

@AdmiralCurtiss AdmiralCurtiss merged commit 1eb69ea into dolphin-emu:master Jan 30, 2023
11 checks passed
@TellowKrinkle TellowKrinkle deleted the FixIncludeDirs branch January 30, 2023 20:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants