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.

Sign up for GitHub

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

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
21e5061
Updated wrap files for cpputest-4.0
SteelPh0enix Feb 7, 2024
f09f1b9
Renamed meson.options to meson_options.txt
SteelPh0enix Feb 8, 2024
9cee674
Added build options for cpputest
SteelPh0enix Feb 8, 2024
8d92bee
Added extensions to deps in releases.json and fixed build options
SteelPh0enix Feb 8, 2024
4902c42
Merged extensions into main CppUTest dep + fixed CI config
SteelPh0enix Feb 8, 2024
e1478e3
Removed CppUTestExt from releases.json as it's now a single dependency
SteelPh0enix Feb 8, 2024
523ffbd
Typo fixes
SteelPh0enix Feb 8, 2024
e94fe13
Renamed options + added simple platform autodetection
SteelPh0enix Feb 9, 2024
a83b5d8
Removed unnecessary "build_on" from ci_config
SteelPh0enix Feb 9, 2024
93058dc
Added clang-cl to autodetection
SteelPh0enix Feb 9, 2024
cde009a
Moved clang-cl to VisualCpp
SteelPh0enix Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion subprojects/packagefiles/cpputest/src/Platforms/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@SteelPh0enix SteelPh0enix Feb 9, 2024 •
edited
Loading

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

@SteelPh0enix SteelPh0enix Feb 9, 2024 •
edited
Loading

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

cpputest_platform = 'Gcc'
elif compiler_id == 'msvc'
cpputest_platform = 'VisualCpp'
Expand Down