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

Cherry-picks for the godot-cpp 4.1 branch - 5th batch #1281

Merged
merged 8 commits into from
Oct 24, 2023

Conversation

dsnopek
Copy link
Collaborator

@dsnopek dsnopek commented Oct 22, 2023

The 5th batch of PR's marked with cherrypick:4.1

mihe and others added 6 commits October 22, 2023 14:03
And clean it up a bit.

(cherry picked from commit 18bfa13)
This comment enables the possibility to build the "compile_commands.json"
file by only using `scons -Q compiledb`. No need to use the argument
`compiledb=yes`.

And when using the `compiledb=yes`, it will create a
"compiled_commands.json" automatically.

(cherry picked from commit 2d5024a)
@akien-mga
Copy link
Member

In upstream Godot in 4.1, we cherry-picked the option to disable exceptions, but we didn't enable it by default, as that's IMO a compat breakage. So I would suggest doing the same for godot-cpp.

@dsnopek
Copy link
Collaborator Author

dsnopek commented Oct 23, 2023

Ah, thanks, that makes sense! I've amended that commit to default to False

CMakeLists.txt Outdated Show resolved Hide resolved
test/CMakeLists.txt Outdated Show resolved Hide resolved
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Aside from CMake changes for disabling exceptions, looks good to go.

@akien-mga akien-mga merged commit 04b3407 into godotengine:4.1 Oct 24, 2023
12 checks passed
@akien-mga akien-mga added this to the 4.1 milestone Oct 24, 2023
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This has been identified as a bug enhancement This is an enhancement on the current functionality topic:buildsystem Related to the buildsystem or CI setup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants