-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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
[tomlplusplus] Add new port #10786
[tomlplusplus] Add new port #10786
Conversation
Oh, nice! @traversaro any chance you could update this PR to sync with the current HEAD of toml++? I've been doing some bugfixing and maintenance stuff over the last few days that I've just locked in as minor release v1.2.3. |
c2beb4c
to
25b3e7c
Compare
Done! For reference, unless there are some changes in the build system, updating to a new version is just a matter of update the version in the CONTROL and portfile.cmake files, and the hash in the portfile.cmake file. |
@traversaro Nice, thanks for the info! |
/azp run |
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
/azp run |
Azure Pipelines could not run because the pipeline triggers exclude this branch/path. |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
@traversaro Thanks for your PR! |
That is indeed not expected, at least |
@Cheney-W I tried the port for |
@traversaro You could get the log with following steps: |
Thanks @Cheney-W ! The
So I guess this is something that should be addressed on the CI machine, if you think it is not feasible I will mark |
@traversaro
vcpkg/buildtrees/tomlplusplus/x64-linux-dbg/meson-logs/meson-log.txt:
|
@Cheney-W meson needs to be version 0.47 or higher |
In that case, probably indeed it make sense to mark |
@traversaro |
Sorry for the delay. I checked the other triplets and they seems to be failing due to missing support for cross-compilation in https://github.com/microsoft/vcpkg/blob/5deea3b975fe62990973d73a102de818d83ba20c/scripts/cmake/vcpkg_configure_meson.cmake . I would soon look into that and either fix it or add them to the list of expected failures. |
8b2860a
to
059fb5b
Compare
059fb5b
to
b1a4455
Compare
@Cheney-W for the time being I just explicitly disabled the unsupported platforms, and the relative issues are:
As on Linux the port can be successfully installed if you have a recent meson (for example if you are on a recent distro or you installed meson via |
@traversaro Thanks for your reply! |
b1a4455
to
ddf1428
Compare
Hi @LilyWangL , thanks for resolving the conflicts. I see that the CI is now passing, but I don't know if all that changes in |
@traversaro |
Thanks, I will cleanup the |
@traversaro You don't need to do anything, now you just have to wait for this PR to be merged. |
@Cheney-W It seems your editor is trying to change the line endings on ci.baseline.txt causing every line to be edited... |
Looks like the original line endings on ci.baseline.txt is LF, but after applied the suggestion commit, It becomes CRLF. |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
I merged the branch with master. |
@traversaro FYI: https://github.com/marzer/tomlplusplus/releases/tag/v2.0.0 (I'm unlikely to make another release for a decent while since I have other things I need to catch up on) |
Thanks. To be honest I was trying to get this through as it is, and then once it goes through just do a PR with the new release, that should have much less spurious CI problems, as what is making the CI for this PR so flaky is that it includes a modification to |
Yeah that's fair. I'm happy to do the v2.0.0 PR myself once this one goes through. |
The CI is now failing with a few |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
Thanks a lot @strega-nil ! |
Thanks to you @traversaro :) |
* vcpkg_fixup_cmake_targets: Add support for processing cmake config files generated by meson In particular this adds a workaround for the differences between CMake and meson described in mesonbuild/meson#6955 * Add tomlplusplus * Resolve conflicts * Update scripts/ci.baseline.txt * [tomplusplus] Update ci.basline.txt Co-authored-by: Billy Robert O'Neal III <[email protected]> Co-authored-by: wangli28 <[email protected]> Co-authored-by: Cheney Wang <[email protected]>
Describe the pull request
This PR adds a port for the
tomlplusplus
library.Furthermore, as
tomlplusplus
installs a CMake configuration file generated by meson, it also fixes thevcpkg_fixup_cmake_targets
function to correctly deal with CMake configuration files generated by meson, see mesonbuild/meson#6955 for more info.What does your PR fix?
Fix [New Port Request] tomlplusplus #10667 .
Which triplets are supported/not supported? Have you updated the CI baseline?
I would expect all the triplets to work fine, so I think it is not necessary to update the CI baseline.
Does your PR follow the maintainer guide?
Yes