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

[fmt] update to 11.1.3 #43549

Closed
wants to merge 4 commits into from
Closed

[fmt] update to 11.1.3 #43549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23380cd
[fmt] update to 11.1.3
rremilian Jan 30, 2025
dc13470
[wpilib] update to 2025.02.01
Feb 4, 2025
1d5255b
[wpilib] use wpilib bundled version of eigen
Feb 4, 2025
faf54a8
[wpilib] remove CMAKE_CXX_STANDARD
Feb 4, 2025
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
17 changes: 0 additions & 17 deletions ports/fmt/fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions ports/fmt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fmtlib/fmt
REF "${VERSION}"
SHA512 47ff6d289dcc22681eea6da465b0348172921e7cafff8fd57a1540d3232cc6b53250a4625c954ee0944c87963b17680ecbc3ea123e43c2c822efe0dc6fa6cef3
SHA512 c1b94ab149d8b1c750dc91fcc1dc9b680d4bd01a9da1e5e74151b2e2f82f811e845e3362922e75b12fcca172ee3f2606e061c001bfa358a86f25cce4ff2d36ef
HEAD_REF master
PATCHES
fix-write-batch.patch
fix-pass-utf-8-only-if-the-compiler-is-MSVC-at-build.patch # remove in next release
)

vcpkg_cmake_configure(
Expand Down
3 changes: 1 addition & 2 deletions ports/fmt/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "fmt",
"version": "11.0.2",
"port-version": 1,
"version": "11.1.3",
"description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.",
"homepage": "https://github.com/fmtlib/fmt",
"license": "MIT",
Expand Down
36 changes: 0 additions & 36 deletions ports/wpilib/fix-build-error-with-fmt11.patch
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions ports/wpilib/fix-usage.patch
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ports/wpilib/missing-find_dependency.patch
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ports/wpilib/no-werror.patch
View file
Open in desktop

This file was deleted.

17 changes: 7 additions & 10 deletions ports/wpilib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
string(REPLACE "-0" "." temp_date ${VERSION})
string(REPLACE "-" "." formatted_date ${temp_date})

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO wpilibsuite/allwpilib
REF 165ebe4c79c437c7ba6c03af4a88a8c8680f742a
SHA512 f6ee07db0a119a7ac5876c4b0cf74abfb6af635d3d3ba913300138c450f62f6595ac4849bc499346f9f0179cc563f548a5e8a9a47122af593b425af453afd99f
PATCHES
no-werror.patch
windows-install-location.patch
missing-find_dependency.patch
fix-usage.patch
fix-build-error-with-fmt11.patch
REF "v${formatted_date}"
SHA512 729ab66a39725551e36bce26ffb6dd9f40f941f432322e9733f4652dae294dafe2544647c6f05c7f301955429b1aca8549f5b7f17bacd50524bfe1ad4ae1d2ee
)

if("allwpilib" IN_LIST FEATURES)
Expand All @@ -34,14 +31,14 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DWITH_JAVA=OFF
-DWITH_JAVA=OFF
-DWITH_EXAMPLES=OFF
-DWITH_TESTS=OFF
-DWITH_GUI=OFF
-DWITH_SIMULATION_MODULES=OFF
-DUSE_SYSTEM_FMTLIB=ON
-DUSE_SYSTEM_LIBUV=ON
-DUSE_SYSTEM_EIGEN=ON
-DUSE_SYSTEM_EIGEN=OFF
"-DFETCHCONTENT_SOURCE_DIR_APRILTAGLIB=${SOURCE_PATH_APRILTAG}"
MAYBE_UNUSED_VARIABLES
FETCHCONTENT_SOURCE_DIR_APRILTAGLIB
Expand Down
5 changes: 2 additions & 3 deletions ports/wpilib/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"name": "wpilib",
"version-date": "2023-08-24",
"port-version": 1,
"version-date": "2025-02-01",
"description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.",
"homepage": "https://github.com/wpilibsuite/allwpilib",
"license": null,
"dependencies": [
"eigen3",
Copy link
Contributor

Choose a reason for hiding this comment

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

vcpkg doesn't want vendored libraries...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@dg0yt Thanks for your feedback.

I couldn't build wpilib using eigen version 3.4.0. I will leave this comment here, since I think it is relevant to the issue: SleipnirGroup/Sleipnir#745 (comment)
This being the case, I have used the newer eigen version, which is bundled with wpilib and it seems to work. Considering this, should eigen port be updated to a newer version or what will be the best approach here ?

"fmt",
"libuv",
"protobuf",
{
"name": "vcpkg-cmake",
"host": true
Expand Down
Loading
Loading