From 74f58c48f5645a1d12288ad07fe12816c813a527 Mon Sep 17 00:00:00 2001
From: Jaroslav Fowkes <jaroslav.fowkes@stfc.ac.uk>
Date: Tue, 22 Sep 2026 15:09:21 +0000
Subject: [PATCH 1/3] Fix CMakeLists.txt

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69e04a9..32c9ad8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 # Add project sources to python module
 file(GLOB SOURCES src/*.cpp)
 pybind11_add_module(gofit ${SOURCES})
-target_include_directories(gofit PRIVATE ${EIGEN3_INCLUDE_DIR})
+target_link_libraries(gofit PRIVATE Eigen3::Eigen)
 
 # EXAMPLE_VERSION_INFO is defined by setup.py and passed into the C++ code as a
 # define (VERSION_INFO) here.

From 73adccfb03db45550671d8c6ddc98042b70dfc8b Mon Sep 17 00:00:00 2001
From: Jaroslav Fowkes <jaroslav.fowkes@stfc.ac.uk>
Date: Tue, 22 Sep 2026 15:11:57 +0000
Subject: [PATCH 2/3] [CI] Remove include path hacks

---
 .github/workflows/build_wheels.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 560d106..a56de74 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -34,16 +34,14 @@ jobs:
             tar xzf eigen-5.0.1.tar.gz &&
             cmake -S eigen-5.0.1 -B eigen-build -DCMAKE_INSTALL_PREFIX=/usr/local -DEIGEN_BUILD_BLAS=OFF -DEIGEN_BUILD_LAPACK=OFF -DBUILD_TESTING=OFF &&
             cmake --install eigen-build
-          CIBW_ENVIRONMENT_LINUX: 'CPATH="/usr/local/include/eigen3"'
           CIBW_BEFORE_BUILD_LINUX: pip install pybind11[global]
 
           # Install Eigen and pybind11 on macOS
           CIBW_BEFORE_ALL_MACOS: brew install eigen pybind11
-          CIBW_ENVIRONMENT_MACOS: 'CPLUS_INCLUDE_PATH="/opt/homebrew/include/eigen3:/usr/local/include/eigen3"'
 
           # Install Eigen and pybind11 on Windows images (no brew, need Eigen >= 3.4)
           CIBW_BEFORE_ALL_WINDOWS: "choco install eigen -y"
-          CIBW_ENVIRONMENT_WINDOWS: 'CMAKE_ARGS="-DCMAKE_PREFIX_PATH=C:\ProgramData\chocolatey\lib\eigen -DCMAKE_INCLUDE_PATH=C:\ProgramData\chocolatey\lib\eigen\include\eigen3"'
+          CIBW_ENVIRONMENT_WINDOWS: 'CMAKE_ARGS="-DCMAKE_PREFIX_PATH=C:\ProgramData\chocolatey\lib\eigen"'
           CIBW_BEFORE_BUILD_WINDOWS: pip install pybind11[global] delvewheel
 
           # cibuildwheel doesn't yet ship a default repair command for Windows

From b0feb1a899f06e7b5b3c3c426103092845a2c8e7 Mon Sep 17 00:00:00 2001
From: Jaroslav Fowkes <jaroslav.fowkes@stfc.ac.uk>
Date: Tue, 22 Sep 2026 15:16:39 +0000
Subject: [PATCH 3/3] [CI] Remove include path hack from tests

---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1e5cbff..d2032af 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,7 +28,6 @@ jobs:
       run: |
         eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
         brew install eigen pybind11
-        export CPLUS_INCLUDE_PATH="/home/linuxbrew/.linuxbrew/opt/eigen/include/eigen3:$CPLUS_INCLUDE_PATH"
         export CMAKE_PREFIX_PATH="/home/linuxbrew/.linuxbrew/opt/eigen"
         export CMAKE_ARGS="-DCMAKE_PREFIX_PATH=/home/linuxbrew/.linuxbrew/opt/eigen"
         pip install .