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

Jump to bottom

Feature/meson subproject #15916

Merged
merged 11 commits into from
Mar 25, 2024
Merged

Feature/meson subproject #15916

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4d2ac6f
Add subproject to meson
fnadeau Mar 18, 2024
858e967
Reword variable and add unit test
fnadeau Mar 19, 2024
eebae8b
Don't restrict Linux to GCC 9
fnadeau Mar 20, 2024
5cfb86e
Add integration test
fnadeau Mar 21, 2024
c981365
Revert change to _base.py
fnadeau Mar 24, 2024
58a5027
Merge branch 'conan-io:develop2' into feature/meson_subproject
fnadeau Mar 24, 2024
4ad7205
Simplified test
franramirez688 Mar 25, 2024
aaadc0b
Requiring cmake tool
franramirez688 Mar 25, 2024
538a856
Safe option conversion
franramirez688 Mar 25, 2024
1aa3a8e
Renamed meson options file
franramirez688 Mar 25, 2024
2beab03
msvc fix
franramirez688 Mar 25, 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
Prev Previous commit
Next Next commit
Merge branch 'conan-io:develop2' into feature/meson_subproject
  • Loading branch information
@fnadeau
fnadeau authored Mar 24, 2024
commit 58a502786ab5bb74bf3cdba050f004a075e8d27b

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.