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: Use generator expressions for codesign targets #11667

Merged
merged 2 commits into from Apr 5, 2023

Conversation

TellowKrinkle
Copy link
Contributor

Switches codesign targets from blindly attempting to codesign the places where targets might be placed to using generator expressions so cmake inserts the actual location of the target.

Also changes storyboard compiling from a POST_BUILD step to using proper dependency tracking. In addition to avoiding the above issue, this also means that if someone edits the .storyboard, it will properly be recompiled.

Also works around a bug where CMake's ninja generator doesn't properly handle ||'s on POST_BUILD commands, making the || apply to the whole build like `<link> && custom0 || custom1`
@AdmiralCurtiss
Copy link
Contributor

I'm not very familiar with Mac stuff but in terms of CMake this makes sense to me.

Copy link
Member

@OatmealDome OatmealDome left a comment

Choose a reason for hiding this comment

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

Sorry about the delay. LGTM.

@OatmealDome OatmealDome merged commit 2995b5e into dolphin-emu:master Apr 5, 2023
14 checks passed
@TellowKrinkle TellowKrinkle deleted the DontSucceedOnLinkFail branch April 6, 2023 06:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants