[wpilib] use wpilib bundled version of eigen

microsoft · Feb 4, 2025 · 478a749 · 478a749
1 parent 9102b51
commit 478a749
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 20 deletions.
diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake
@@ -6,8 +6,6 @@ vcpkg_from_github(
     REPO wpilibsuite/allwpilib
     REF "v${formatted_date}"
     SHA512 729ab66a39725551e36bce26ffb6dd9f40f941f432322e9733f4652dae294dafe2544647c6f05c7f301955429b1aca8549f5b7f17bacd50524bfe1ad4ae1d2ee
-    PATCHES
-        remove_eigen_placeholders.patch
 )
 
 if("allwpilib" IN_LIST FEATURES)
@@ -41,7 +39,7 @@ vcpkg_cmake_configure(
         -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

diff --git a/ports/wpilib/remove_eigen_placeholders.patch b/ports/wpilib/remove_eigen_placeholders.patch
diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json
@@ -5,7 +5,6 @@
   "homepage": "https://github.com/wpilibsuite/allwpilib",
   "license": null,
   "dependencies": [
-    "eigen3",
     "fmt",
     "libuv",
     "protobuf",

diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "5b3788629fcace250831d368cbd2fa1d70e83a6c",
+      "git-tree": "b35228c0fbc378f5bd27792d2b67542b73ff7a98",
       "version-date": "2025-02-01",
       "port-version": 0
     },