From ef88eaccef94e659301f81665c70e565b505d3cd Mon Sep 17 00:00:00 2001
From: Jim McCann <ix@tchow.com>
Date: Fri, 27 Oct 2023 23:23:27 -0400
Subject: [PATCH] transition to submodule for eigen instead of system

---
 .github/workflows/build-workflow.yml |  4 +---
 .gitignore                           |  1 -
 .gitmodules                          |  3 +++
 Maekfile.js                          |  4 ++--
 README.md                            | 11 ++++-------
 eigen                                |  1 +
 6 files changed, 11 insertions(+), 13 deletions(-)
 create mode 160000 eigen

diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml
index 27deb94..89d162c 100644
--- a/.github/workflows/build-workflow.yml
+++ b/.github/workflows/build-workflow.yml
@@ -31,7 +31,6 @@ jobs:
         run: |
           dir/w
           #call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          git clone https://github.com/eigenteam/eigen-git-mirror eigen
           node Maekfile.js -q
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
@@ -74,7 +73,7 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update
-          sudo apt-get install libgl-dev libasound2-dev libeigen3-dev
+          sudo apt-get install libgl-dev libasound2-dev
           ls
           node Maekfile.js -q
       - name: Upload Artifact
@@ -114,7 +113,6 @@ jobs:
           cd ..
           wget https://github.com/15-466/nest-libs/releases/download/${NEST_LIBS_VERSION}/nest-libs-macos-${NEST_LIBS_VERSION}.tar.gz -Onest-libs.tar.gz
           tar xfz nest-libs.tar.gz
-          brew install eigen
       - name: Build Code
         shell: bash
         run: |
diff --git a/.gitignore b/.gitignore
index a33422d..3aba8e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 objs
 dist/schedule
 dist/
-eigen/
 kit-libs-win/
 kit-libs-linux/
 maek-cache.json
diff --git a/.gitmodules b/.gitmodules
index 6759dd0..9e86ad1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "kit"]
 	path = kit
 	url = git@github.com:ixchow/kit
+[submodule "eigen"]
+	path = eigen
+	url = https://github.com/eigenteam/eigen-git-mirror
diff --git a/Maekfile.js b/Maekfile.js
index 725f162..b0b24fe 100644
--- a/Maekfile.js
+++ b/Maekfile.js
@@ -153,13 +153,13 @@ const schedule_names = [
 //extra flags for finding Eigen:
 const interpolate_values_CPPFlags = [...maek.options.CPPFlags];
 if (maek.OS === "macos") {
-	interpolate_values_CPPFlags.push('-I/opt/homebrew/include/eigen3', '-Wno-unused-but-set-variable');
+	interpolate_values_CPPFlags.push('-Ieigen', '-Wno-unused-but-set-variable');
 } else if (maek.OS === "windows") {
 	interpolate_values_CPPFlags.push('/Ieigen', '/D_SILENCE_CXX17_RESULT_OF_DEPRECATION_WARNING',
 		`/wd4459` //local definition hides global
 	);
 } else {
-	interpolate_values_CPPFlags.push('-I/usr/include/eigen3');
+	interpolate_values_CPPFlags.push('-Ieigen');
 }
 
 const link_names = [
diff --git a/README.md b/README.md
index 09b266e..92c5e80 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,8 @@ Building autoknit is handled with the single-file build tool [maek](https://gith
 
 ### <a name="mac"></a>MacOS setup
 ```
-#install eigen library and nodejs (used for build script and to post-process scheduled output):
-brew install eigen node
+#install nodejs (used for build script and to post-process scheduled output):
+brew install node
 
 #extract nest-libs package as a sibling of autoknit folder:
 curl 'https://github.com/15-466/nest-libs/releases/download/v0.13/nest-libs-macos-v0.13.tar.gz' -L -O
@@ -37,8 +37,8 @@ git submodule update
 ### <a name="linux"></a>Linux setup
 
 ```
-#install eigen library and nodejs (used for build script and to post-process scheduled output):
-sudo apt-get install libeigen3-dev nodejs
+#install nodejs (used for build script and to post-process scheduled output):
+sudo apt-get install nodejs
 
 #extract nest-libs package as a sibling of autoknit folder:
 curl 'https://github.com/15-466/nest-libs/releases/download/v0.13/nest-libs-linux-v0.13.tar.gz' -L -O
@@ -57,9 +57,6 @@ First, make sure that git is installed in such a way that it can be run from a c
 
 Then, from a `Visual Studio 2022 > x64 Native Tools Command Prompt for VS 2022` command prompt do:
 ```
-#get a local copy of the eigen library:
-git clone git@github.com:eigenteam/eigen-git-mirror eigen
-
 #clone repository:
 git clone git@github.com:textiles-lab/autoknit
 cd autoknit
diff --git a/eigen b/eigen
new file mode 160000
index 0000000..36b9596
--- /dev/null
+++ b/eigen
@@ -0,0 +1 @@
+Subproject commit 36b95962756c1fce8e29b1f8bc45967f30773c00