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

cpputest: fixed wrap #1398

Merged
merged 11 commits into from
Feb 9, 2024
Merged

cpputest: fixed wrap #1398

merged 11 commits into from
Feb 9, 2024

Conversation

SteelPh0enix
Copy link
Contributor

@SteelPh0enix SteelPh0enix commented Feb 7, 2024

Current wrap of CppUTest is fundamentally broken in multiple ways:

  • Overwrites main dependency (by default), making it impossible to link it and use the wrap
  • It's ignoring the existence of platform-specific implementations, forcing the user to provide them manually
  • Typo in options

This PR fixes all those issues and makes this wrap usable.

@SteelPh0enix
Copy link
Contributor Author

SteelPh0enix commented Feb 7, 2024

Any suggestions how could i keep the extensions off by default while keeping the CI green?

Not even necessarily for this case, just curious.

@jpakkane
Copy link
Member

jpakkane commented Feb 7, 2024

You can specify build options in ci_config.json.

@SteelPh0enix
Copy link
Contributor Author

I've added CI settings, fixed some stuff and performed sanity checks locally, it should be green now.

@SteelPh0enix
Copy link
Contributor Author

Huh, so that's how this switch works...

All right, i'll make a compiler check in there for MSVC and GCC/Clang, should be good enough for the CI and "most people".

@SteelPh0enix
Copy link
Contributor Author

Done, hopefully that's the last issue

@@ -3,7 +3,7 @@ cpputest_platform = get_option('cpputest_platform')
if cpputest_platform != 'none'
if cpputest_platform == 'autodetect'
compiler_id = meson.get_compiler('cpp').get_id()
if compiler_id == 'clang' or compiler_id == 'gcc'
if compiler_id == 'gcc' or compiler_id == 'clang' or compiler_id == 'clang-cl'
Copy link
Collaborator

Choose a reason for hiding this comment

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

should it be treated as GCC or VisualCpp?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, it passes here so I'm not sure if it's just a funky compatibility layer, or intended behaviour.
I'll throw it to VisualCpp and let's see what happens

Copy link
Contributor Author

Choose a reason for hiding this comment

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

After quick read, yeah, this should definitely be treated as VisualCpp

@neheb neheb merged commit ab74fbf into mesonbuild:master Feb 9, 2024
8 checks passed
@SteelPh0enix SteelPh0enix deleted the cpputest branch February 9, 2024 08:14
polesapart pushed a commit to polesapart/wrapdb that referenced this pull request Feb 9, 2024
* Updated wrap files for cpputest-4.0

* Renamed meson.options to meson_options.txt

* Added build options for cpputest

* Added extensions to deps in releases.json and fixed build options

* Merged extensions into main CppUTest dep + fixed CI config

* Removed CppUTestExt from releases.json as it's now a single dependency

* Typo fixes

* Renamed options + added simple platform autodetection

* Removed unnecessary "build_on" from ci_config

* Added clang-cl to autodetection

* Moved clang-cl to VisualCpp
willwray pushed a commit to willwray/wrapdb that referenced this pull request Apr 22, 2024
* Updated wrap files for cpputest-4.0

* Renamed meson.options to meson_options.txt

* Added build options for cpputest

* Added extensions to deps in releases.json and fixed build options

* Merged extensions into main CppUTest dep + fixed CI config

* Removed CppUTestExt from releases.json as it's now a single dependency

* Typo fixes

* Renamed options + added simple platform autodetection

* Removed unnecessary "build_on" from ci_config

* Added clang-cl to autodetection

* Moved clang-cl to VisualCpp
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.

None yet

3 participants