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

Enable tomlplusplus port for OSX and ARM #21742

Merged
merged 5 commits into from
Nov 30, 2021
Merged

Enable tomlplusplus port for OSX and ARM #21742

merged 5 commits into from
Nov 30, 2021

Conversation

lisaong
Copy link
Contributor

@lisaong lisaong commented Nov 29, 2021

Describe the pull request

  • What does your PR fix?

    OSX was disabled in the original tomlplusplus port due to an issue with meson. That issue has been resolved and verified on OSX x64.

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    Adds previously disabled support for:
    osx, Yes

The CI baseline does not contain entries for tomlplusplus, so it's left untouched.

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes. Port version incremented to 1.

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 3a68454afa67bde8b6e9e741536daa95d3785966 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/t-/tomlplusplus.json b/versions/t-/tomlplusplus.json
index 6077c4a..d3a7813 100644
--- a/versions/t-/tomlplusplus.json
+++ b/versions/t-/tomlplusplus.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "5e788e0b38a2700c7269dbe85f00b83a7e6859a4",
+      "git-tree": "6a128968ba3461b10e1c0b633651e202413d2853",
       "version": "2.5.0",
       "port-version": 1
     },

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/tomlplusplus/portfile.cmake

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/tomlplusplus/portfile.cmake

@lisaong lisaong changed the title Enabled tomlplusplus to port for OSX Enable tomlplusplus port for OSX Nov 29, 2021
@JackBoosY JackBoosY added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Nov 29, 2021
@JackBoosY
Copy link
Contributor

Since meson in vcpkg was upgraded to 0.58.1, I think we can accept this PR.
See official comment.

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Nov 29, 2021
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/tomlplusplus/portfile.cmake

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/tomlplusplus/portfile.cmake

@BillyONeal BillyONeal changed the title Enable tomlplusplus port for OSX Enable tomlplusplus port for OSX and ARM Nov 30, 2021
@BillyONeal BillyONeal merged commit 304b9a0 into microsoft:master Nov 30, 2021
@BillyONeal
Copy link
Member

Thanks for the fix!

@lisaong lisaong deleted the tomlplusplus_enable_osx branch November 30, 2021 01:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants