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

CREATE_PROJECT: Default to C++11 and support MacPorts /opt/local/lib #5376

Merged
merged 2 commits into from Nov 5, 2023

Conversation

somaen
Copy link
Member

@somaen somaen commented Oct 20, 2023

Some small changes to the CMake generator to let it support macOS with libraries installed from MacPorts.

Also an adjustment to support C++11 globally in the generated CMake files.

Pushing this as a PR in case someone disagrees with the global adding of /opt/local/lib.

We have C++11 features in use outside engines as well now.
This should hopefully be fairly harmless for other platforms,
as well as for Homebrew-users. But it doesn't seem like CMake
adds /opt/local/lib to it's linking setup by default.
@@ -174,6 +176,9 @@ if (TARGET SDL2::SDL2)
endif()
include_directories(${SDL2_INCLUDE_DIRS})

# Explicitly support MacPorts (hopefully harmless on other platforms)
Copy link
Member

Choose a reason for hiding this comment

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

Will this work in Windows platforms? There's a WIN32 define, perhaps it can be used for this as well?

@sev-
Copy link
Member

sev- commented Nov 5, 2023

Merging this, but we indeed have to check if it breaks Windows cmake builds. But since I did not hear it used much, I'd wait until somebody is complaining.

@sev- sev- merged commit f7e7d6e into scummvm:master Nov 5, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants