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 file list issues when trying to build with meson via cmake #1307

Merged
merged 1 commit into from
Nov 24, 2023

Conversation

LAK132
Copy link
Contributor

@LAK132 LAK132 commented Nov 11, 2023

While attempting to build this project with meson (via its cmake module) I ran into an issue with the generated file listing having a trailing ; and trailing whitespace, which meson doesn't handle very well. This PR fixes these issues.

@LAK132 LAK132 requested a review from a team as a code owner November 11, 2023 13:02
@dsnopek dsnopek added topic:buildsystem Related to the buildsystem or CI setup bug This has been identified as a bug labels Nov 15, 2023
@dsnopek dsnopek added this to the 4.x milestone Nov 15, 2023
Copy link
Collaborator

@dsnopek dsnopek left a comment

Choose a reason for hiding this comment

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

Thanks!

The change to binding_generator.py looks good to me. Personally, I'm not super familiar with cmake, but I tried building with cmake and make and everything seemed to still work fine. (Unfortunately, I don't know how to test with Meson, but nothing here is Meson specific, so I think that's fine.)

@akien-mga akien-mga modified the milestones: 4.x, 4.2 Nov 24, 2023
@akien-mga akien-mga merged commit 4fed88a into godotengine:master Nov 24, 2023
12 checks passed
@akien-mga
Copy link
Member

Thanks!

@dsnopek
Copy link
Collaborator

dsnopek commented Jan 22, 2024

Cherry-picking to 4.1 in #1373

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 topic:buildsystem Related to the buildsystem or CI setup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants