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

separate cmakedefine and mesondefine logic #13208

Merged
merged 1 commit into from
Dec 10, 2024

Conversation

Jan200101
Copy link
Contributor

@Jan200101 Jan200101 commented May 12, 2024

Follows upstream cmake, see configure_file.

cmake substitutes ${VAR} and @VAR@ by default and only @VAR@ if @ONLY is specified.

meson previously substituded ${VAR} with cmake and @VAR@ with cmake@ but this has now been fixed so that cmake also substitudes @VAR@.

Ontop of that I also split most of the cmakedefine and mesondefine code into specific functions so changes to either won't cause regressions in the other (as the previous cmakedefine PR did).

work was done to ensure all the exported interfaces continue being available.

cmakedefine was tested using cmakedefine-test and mesondefine was tested using the AllPlatformTests.test_do_conf_file_by_format unit test.

@Jan200101 Jan200101 requested a review from jpakkane as a code owner May 12, 2024 18:07
@Jan200101
Copy link
Contributor Author

the compilation errors appear unrelated

@Jan200101 Jan200101 changed the title do @ substitution for normal cmake format, separate cmakedefine and mesondefine logic separate cmakedefine and mesondefine logic Dec 9, 2024
@Jan200101
Copy link
Contributor Author

completely remade this from scratch, cut down to only separate the logic

CI failure is yet again out of my control

@dcbaker dcbaker merged commit 8156e12 into mesonbuild:master Dec 10, 2024
33 checks passed
@Jan200101 Jan200101 deleted the PR/cmake-split branch December 11, 2024 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants