From 028a71d0584861c97a92d2871eb6daa776d55cbf Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 4 Nov 2024 12:19:16 +0100
Subject: [PATCH 01/25] Try with older mpi4py.

---
 .github/workflows/windows.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8c18856fb2..6a6a3eea5a 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -1,9 +1,9 @@
 name: Windows build
 
 on:
-  # push:
-  #   branches:
-  #     - main
+  push:
+    branches:
+      - "**"
   #   tags:
   #     - "v*"
   # pull_request:
@@ -98,7 +98,7 @@ jobs:
           (Get-Content __init__.py).Replace('# WINDOWSDLL', 'import os; os.add_dll_directory("D:/a/dolfinx/dolfinx-install/bin"); os.add_dll_directory("C:/Program Files (x86)/Intel/oneAPI/mpi/2021.12/opt/mpi/libfabric/bin")') | Set-Content __init__.py
           Get-Content __init__.py
 
-      - uses: mpi4py/setup-mpi@v1.2.6
+      - uses: mpi4py/setup-mpi@v1.2.2
         with:
           mpi: "intelmpi"
 
@@ -130,7 +130,7 @@ jobs:
       - name: Install build dependencies
         working-directory: dolfinx
         run: |
-          pip -v install --no-binary mpi4py -r python/build-requirements.txt
+          pip -v install --no-binary mpi4py -r "mpi4py<4"
 
       - name: Install DOLFINx (Python)
         working-directory: dolfinx

From 181cc47d69c725eb97bfb937c030dc371c6afb49 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 4 Nov 2024 15:15:12 +0100
Subject: [PATCH 02/25] Try explicit typing.

---
 cpp/dolfinx/graph/ordering.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/dolfinx/graph/ordering.cpp b/cpp/dolfinx/graph/ordering.cpp
index df41220546..c2d05219e5 100644
--- a/cpp/dolfinx/graph/ordering.cpp
+++ b/cpp/dolfinx/graph/ordering.cpp
@@ -209,7 +209,8 @@ gps_reorder_unlabelled(const graph::AdjacencyList<std::int32_t>& graph,
   std::vector<std::array<int, 2>> lvp(n);
   for (int i = 0; i < k; ++i)
   {
-    for (int w : lv.links(i))
+    std::span<int> lv_links = lv.links(i);
+    for (int w : lv_links)
       lvp[w][0] = i;
     for (int w : lu.links(i))
       lvp[w][1] = k - 1 - i;

From d998642ac93fd956632f189f12a44d96be33630d Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 4 Nov 2024 16:44:37 +0100
Subject: [PATCH 03/25] Try std::size_t?

---
 cpp/dolfinx/graph/ordering.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpp/dolfinx/graph/ordering.cpp b/cpp/dolfinx/graph/ordering.cpp
index c2d05219e5..187e88e529 100644
--- a/cpp/dolfinx/graph/ordering.cpp
+++ b/cpp/dolfinx/graph/ordering.cpp
@@ -210,7 +210,7 @@ gps_reorder_unlabelled(const graph::AdjacencyList<std::int32_t>& graph,
   for (int i = 0; i < k; ++i)
   {
     std::span<int> lv_links = lv.links(i);
-    for (int w : lv_links)
+    for (std::size_t w : lv_links)
       lvp[w][0] = i;
     for (int w : lu.links(i))
       lvp[w][1] = k - 1 - i;

From bf4e0b18aaae15247fb7e883f3b9adf80c13a09a Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 16:10:59 +0100
Subject: [PATCH 04/25] Try building with clang-cl.exe/LLVM

---
 .github/workflows/windows.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 6a6a3eea5a..2f7beaaf3b 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -37,6 +37,12 @@ jobs:
       - name: Install UFL
         run: pip install git+https://github.com/FEniCS/ufl.git
 
+      - name: Checkout custom vcpkg triplets
+         uses: actions/checkout@v4
+         with:
+           repository: Neumann-A/my-vcpkg-triplets
+           path: vcpkg-triplets/
+
       - name: Checkout Basix
         uses: actions/checkout@v4
         with:
@@ -53,7 +59,7 @@ jobs:
         working-directory: basix
         run: |
           cd cpp
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -B build-dir -S .
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/basix-install
           echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -66,7 +72,7 @@ jobs:
         working-directory: basix
         run: |
           cd python
-          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix
+          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=vcpkg-triplets/ --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
           cd ../
 
       - name: Checkout FFCx
@@ -105,7 +111,7 @@ jobs:
       - name: Install DOLFINx (C++)
         working-directory: dolfinx
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -B build-dir -S cpp
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S cpp
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/dolfinx-install
           echo "D:/a/dolfinx/dolfinx-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -113,7 +119,7 @@ jobs:
       - name: Build unit tests (C++)
         working-directory: dolfinx
         run: |
-          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -B build/test/ -S cpp/test/
+          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build/test/ -S cpp/test/
           cmake --build build/test --config Release --parallel 3
 
       - name: Run unit tests (C++, MPI, np=1)
@@ -136,7 +142,7 @@ jobs:
         working-directory: dolfinx
         run: |
           cd python
-          pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR=D:/a/dolfinx/basix-install/lib/cmake/basix --config-settings=cmake.args=-Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake --config-settings=cmake.args=-DDOLFINX_DIR=D:/a/dolfinx/dolfinx-install/lib/cmake/dolfinx --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --config-settings=cmake.args=-DVCPKG_OVERLAY_PORTS="../cpp/.vcpkg-overlay"
+          pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR=D:/a/dolfinx/basix-install/lib/cmake/basix --config-settings=cmake.args=-Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake --config-settings=cmake.args=-DDOLFINX_DIR=D:/a/dolfinx/dolfinx-install/lib/cmake/dolfinx --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --config-settings=cmake.args=-DVCPKG_OVERLAY_PORTS="../cpp/.vcpkg-overlay" --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=vcpkg-triplets/ --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
 
       - name: Run units tests (Python, serial)
         working-directory: dolfinx

From a21879d8a489b39538cb9b49c25650d05eb83f1f Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 16:17:29 +0100
Subject: [PATCH 05/25] Fix paths.

---
 .github/workflows/windows.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 2f7beaaf3b..f179ea62fa 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -59,7 +59,7 @@ jobs:
         working-directory: basix
         run: |
           cd cpp
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=../../vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/basix-install
           echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -72,8 +72,7 @@ jobs:
         working-directory: basix
         run: |
           cd python
-          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=vcpkg-triplets/ --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
-          cd ../
+          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=../../vcpkg-triplets/ --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
 
       - name: Checkout FFCx
         uses: actions/checkout@v4
@@ -111,7 +110,7 @@ jobs:
       - name: Install DOLFINx (C++)
         working-directory: dolfinx
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S cpp
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=../vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S cpp
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/dolfinx-install
           echo "D:/a/dolfinx/dolfinx-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -119,7 +118,7 @@ jobs:
       - name: Build unit tests (C++)
         working-directory: dolfinx
         run: |
-          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build/test/ -S cpp/test/
+          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=../vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build/test/ -S cpp/test/
           cmake --build build/test --config Release --parallel 3
 
       - name: Run unit tests (C++, MPI, np=1)
@@ -142,7 +141,7 @@ jobs:
         working-directory: dolfinx
         run: |
           cd python
-          pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR=D:/a/dolfinx/basix-install/lib/cmake/basix --config-settings=cmake.args=-Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake --config-settings=cmake.args=-DDOLFINX_DIR=D:/a/dolfinx/dolfinx-install/lib/cmake/dolfinx --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --config-settings=cmake.args=-DVCPKG_OVERLAY_PORTS="../cpp/.vcpkg-overlay" --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=vcpkg-triplets/ --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
+          pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR=D:/a/dolfinx/basix-install/lib/cmake/basix --config-settings=cmake.args=-Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake --config-settings=cmake.args=-DDOLFINX_DIR=D:/a/dolfinx/dolfinx-install/lib/cmake/dolfinx --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --config-settings=cmake.args=-DVCPKG_OVERLAY_PORTS="../cpp/.vcpkg-overlay" --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=../../vcpkg-triplets/ --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
 
       - name: Run units tests (Python, serial)
         working-directory: dolfinx

From fbdf6b82c63ae13a1aaba0dfe0301a7259437c8f Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 16:21:59 +0100
Subject: [PATCH 06/25] Fix.

---
 .github/workflows/windows.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f179ea62fa..f682117e02 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -38,10 +38,10 @@ jobs:
         run: pip install git+https://github.com/FEniCS/ufl.git
 
       - name: Checkout custom vcpkg triplets
-         uses: actions/checkout@v4
-         with:
-           repository: Neumann-A/my-vcpkg-triplets
-           path: vcpkg-triplets/
+        uses: actions/checkout@v4
+        with:
+          repository: Neumann-A/my-vcpkg-triplets
+          path: vcpkg-triplets/
 
       - name: Checkout Basix
         uses: actions/checkout@v4

From 361cc1a429931c0fb83ddd68a6167692d8b08372 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 16:26:16 +0100
Subject: [PATCH 07/25] More quotes.

---
 .github/workflows/windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f682117e02..27bd918962 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -59,7 +59,7 @@ jobs:
         working-directory: basix
         run: |
           cd cpp
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=../../vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS="../../vcpkg-triplets/" -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/basix-install
           echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

From 749c7c6a37e0ec24ab04c646361bd73476269a9a Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 16:45:38 +0100
Subject: [PATCH 08/25] More path fixes.

---
 .github/workflows/windows.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 27bd918962..3ec70688a5 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -72,7 +72,7 @@ jobs:
         working-directory: basix
         run: |
           cd python
-          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=../../vcpkg-triplets/ --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
+          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS="../../vcpkg-triplets/" --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
 
       - name: Checkout FFCx
         uses: actions/checkout@v4
@@ -110,7 +110,7 @@ jobs:
       - name: Install DOLFINx (C++)
         working-directory: dolfinx
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=../vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S cpp
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS="../vcpkg-triplets/" -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S cpp
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/dolfinx-install
           echo "D:/a/dolfinx/dolfinx-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -118,7 +118,7 @@ jobs:
       - name: Build unit tests (C++)
         working-directory: dolfinx
         run: |
-          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=../vcpkg-triplets/ -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build/test/ -S cpp/test/
+          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS="../vcpkg-triplets/" -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build/test/ -S cpp/test/
           cmake --build build/test --config Release --parallel 3
 
       - name: Run unit tests (C++, MPI, np=1)
@@ -141,7 +141,7 @@ jobs:
         working-directory: dolfinx
         run: |
           cd python
-          pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR=D:/a/dolfinx/basix-install/lib/cmake/basix --config-settings=cmake.args=-Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake --config-settings=cmake.args=-DDOLFINX_DIR=D:/a/dolfinx/dolfinx-install/lib/cmake/dolfinx --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --config-settings=cmake.args=-DVCPKG_OVERLAY_PORTS="../cpp/.vcpkg-overlay" --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=../../vcpkg-triplets/ --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
+          pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR=D:/a/dolfinx/basix-install/lib/cmake/basix --config-settings=cmake.args=-Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake --config-settings=cmake.args=-DDOLFINX_DIR=D:/a/dolfinx/dolfinx-install/lib/cmake/dolfinx --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --config-settings=cmake.args=-DVCPKG_OVERLAY_PORTS="../cpp/.vcpkg-overlay" --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS="../../vcpkg-triplets/" --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
 
       - name: Run units tests (Python, serial)
         working-directory: dolfinx

From f4f558b2489436ee39900572f7e453121a3ed733 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 16:52:13 +0100
Subject: [PATCH 09/25] Try absolute paths.

---
 .github/workflows/windows.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 3ec70688a5..67887d7782 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -59,7 +59,7 @@ jobs:
         working-directory: basix
         run: |
           cd cpp
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS="../../vcpkg-triplets/" -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
+        cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/basix-install
           echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -72,7 +72,7 @@ jobs:
         working-directory: basix
         run: |
           cd python
-          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS="../../vcpkg-triplets/" --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
+        python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
 
       - name: Checkout FFCx
         uses: actions/checkout@v4
@@ -110,7 +110,7 @@ jobs:
       - name: Install DOLFINx (C++)
         working-directory: dolfinx
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS="../vcpkg-triplets/" -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S cpp
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S cpp
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/dolfinx-install
           echo "D:/a/dolfinx/dolfinx-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -118,7 +118,7 @@ jobs:
       - name: Build unit tests (C++)
         working-directory: dolfinx
         run: |
-          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS="../vcpkg-triplets/" -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build/test/ -S cpp/test/
+          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build/test/ -S cpp/test/
           cmake --build build/test --config Release --parallel 3
 
       - name: Run unit tests (C++, MPI, np=1)

From 4469d29061b74b617412816c109ff050e39610bb Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 17:15:07 +0100
Subject: [PATCH 10/25] Fix.

---
 .github/workflows/windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 67887d7782..326555c783 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -59,7 +59,7 @@ jobs:
         working-directory: basix
         run: |
           cd cpp
-        cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/basix-install
           echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

From d72cdda0e8772648836c0d99eca3a3af28d0fe58 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 17:19:09 +0100
Subject: [PATCH 11/25] Small fixes.

---
 .github/workflows/windows.yml | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 326555c783..0ce267faea 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Checkout custom vcpkg triplets
         uses: actions/checkout@v4
         with:
-          repository: Neumann-A/my-vcpkg-triplets
+          repository: "Neumann-A/my-vcpkg-triplets"
           path: vcpkg-triplets/
 
       - name: Checkout Basix
@@ -56,9 +56,8 @@ jobs:
           Get-Content __init__.py
 
       - name: Install Basix (C++)
-        working-directory: basix
+        working-directory: basix/cpp
         run: |
-          cd cpp
           cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/basix-install
@@ -69,10 +68,9 @@ jobs:
           python -m pip install git+https://github.com/jhale/nanobind.git@jhale/msvc2022-workaround
           python -m pip install scikit-build-core[pyproject] setuptools wheel
       - name: Install Basix (Python)
-        working-directory: basix
+        working-directory: basix/python
         run: |
-          cd python
-        python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
+          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
 
       - name: Checkout FFCx
         uses: actions/checkout@v4
@@ -122,14 +120,12 @@ jobs:
           cmake --build build/test --config Release --parallel 3
 
       - name: Run unit tests (C++, MPI, np=1)
-        working-directory: dolfinx
+        working-directory: dolfinx/build/test
         run: |
-          cd build/test
           mpiexec -n 1 ctest -V --output-on-failure -R unittests
       - name: Run C++ tests (C++, MPI, np=3)
-        working-directory: dolfinx
+        working-directory: dolfinx/build/test
         run: |
-          cd build/test
           mpiexec -n 3 ctest -V --output-on-failure -R unittests
 
       - name: Install build dependencies
@@ -138,9 +134,8 @@ jobs:
           pip -v install --no-binary mpi4py -r "mpi4py<4"
 
       - name: Install DOLFINx (Python)
-        working-directory: dolfinx
+        working-directory: dolfinx/python
         run: |
-          cd python
           pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR=D:/a/dolfinx/basix-install/lib/cmake/basix --config-settings=cmake.args=-Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake --config-settings=cmake.args=-DDOLFINX_DIR=D:/a/dolfinx/dolfinx-install/lib/cmake/dolfinx --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --config-settings=cmake.args=-DVCPKG_OVERLAY_PORTS="../cpp/.vcpkg-overlay" --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS="../../vcpkg-triplets/" --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
 
       - name: Run units tests (Python, serial)
@@ -154,12 +149,10 @@ jobs:
           mpiexec -n 3 python -m pytest -m "not petsc4py and not adios2" python/test/unit
 
       - name: Run Python demos (serial)
-        working-directory: dolfinx
+        working-directory: dolfinx/python/demo
         run: |
-          cd python/demo
           python3 -m pytest -n auto -m serial --durations=10 test.py
       - name: Run Python demos (MPI, np=3)
-        working-directory: dolfinx
+        working-directory: dolfinx/python/demo
         run: |
-          cd python/demo
           python3 -m pytest -m mpi --num-proc=3 test.py

From a6e3faea36419ac19768b845542cca2004e11180 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 17:26:54 +0100
Subject: [PATCH 12/25] Try again.

---
 .github/workflows/windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 0ce267faea..ca8f7e5b07 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -41,7 +41,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: "Neumann-A/my-vcpkg-triplets"
-          path: vcpkg-triplets/
+          path: vcpkg-triplets
 
       - name: Checkout Basix
         uses: actions/checkout@v4

From 8a5623cddae014dca2ec071571c8272413b7d5bd Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 17:29:44 +0100
Subject: [PATCH 13/25] Try this - need to work on path structure here,
 confusing

---
 .github/workflows/windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index ca8f7e5b07..635061fad2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Install Basix (C++)
         working-directory: basix/cpp
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/basix-install
           echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

From b077943f97e4fafbac3b4ce0d6bbbcf644a43c57 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 17:38:48 +0100
Subject: [PATCH 14/25] Try this.

---
 .github/workflows/windows.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 635061fad2..d7e7116d02 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -58,9 +58,9 @@ jobs:
       - name: Install Basix (C++)
         working-directory: basix/cpp
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=${{ github.workspace }}/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
-          cmake --install build-dir --config Release --prefix D:/a/dolfinx/basix-install
+          cmake --install build-dir --config Release --prefix ${{ github.workspace }}/basix-install
           echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
 
       - name: Install build dependencies (workaround)
@@ -70,7 +70,7 @@ jobs:
       - name: Install Basix (Python)
         working-directory: basix/python
         run: |
-          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
+          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=${{ github.workspace }}/vcpkg-triplets --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
 
       - name: Checkout FFCx
         uses: actions/checkout@v4

From 34c52ab9fdfa9aa4cd8b18ae732305ffac8650be Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 17:44:47 +0100
Subject: [PATCH 15/25] Another attempt.

---
 .github/workflows/windows.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index d7e7116d02..b149995cf7 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -58,10 +58,10 @@ jobs:
       - name: Install Basix (C++)
         working-directory: basix/cpp
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=${{ github.workspace }}/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=$Env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=$GITHUB_WORKSPACE/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
-          cmake --install build-dir --config Release --prefix ${{ github.workspace }}/basix-install
-          echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+          cmake --install build-dir --config Release --prefix $Env:GITHUB_WORKSPACE/basix-install
+          echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $Env:GITHUB_PATH -Encoding utf8
 
       - name: Install build dependencies (workaround)
         run: |

From 4665dd3bc3ddaffc0f4ec3da33cd18cba2d3247b Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 17:49:47 +0100
Subject: [PATCH 16/25] Try quotes

---
 .github/workflows/windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index b149995cf7..a48d07383e 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Install Basix (C++)
         working-directory: basix/cpp
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE=$Env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_TRIPLETS=$GITHUB_WORKSPACE/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE="$Env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_TRIPLETS="$Env:GITHUB_WORKSPACE/vcpkg-triplets" -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix $Env:GITHUB_WORKSPACE/basix-install
           echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $Env:GITHUB_PATH -Encoding utf8

From 2a54bd85cf2062f790134f059ab9c97d071fbea6 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 17:59:04 +0100
Subject: [PATCH 17/25] More path work.

---
 .github/workflows/windows.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index a48d07383e..1f73089b5c 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -58,10 +58,10 @@ jobs:
       - name: Install Basix (C++)
         working-directory: basix/cpp
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE="$Env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_TRIPLETS="$Env:GITHUB_WORKSPACE/vcpkg-triplets" -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_TRIPLETS="$env:GITHUB_WORKSPACE/vcpkg-triplets" -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
           cmake --build build-dir --config Release
-          cmake --install build-dir --config Release --prefix $Env:GITHUB_WORKSPACE/basix-install
-          echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $Env:GITHUB_PATH -Encoding utf8
+          cmake --install build-dir --config Release --prefix "$env:GITHUB_WORKSPACE/basix-install"
+          echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
 
       - name: Install build dependencies (workaround)
         run: |
@@ -70,7 +70,7 @@ jobs:
       - name: Install Basix (Python)
         working-directory: basix/python
         run: |
-          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR=D:/a/basix/install/lib/cmake/basix --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS=${{ github.workspace }}/vcpkg-triplets --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
+          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR="$env:GITHUB_WORKSPACE/basix-install/lib/cmake/basix" --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS="$env:GITHUB_WORKSPACE/vcpkg-triplets" --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
 
       - name: Checkout FFCx
         uses: actions/checkout@v4
@@ -83,7 +83,7 @@ jobs:
         run: |
           cmake -B build-dir -S cmake/
           cmake --build build-dir --config Release
-          cmake --install build-dir --config Release --prefix D:/a/dolfinx/ufcx-install
+          cmake --install build-dir --config Release --prefix "$env:GITHUB_WORKSPACE/ufcx-install"
 
       - name: Install FFCx
         working-directory: ffcx
@@ -98,7 +98,7 @@ jobs:
       - name: Insert add_dll_directory calls into DOLFINx
         working-directory: dolfinx/python/dolfinx
         run: |
-          (Get-Content __init__.py).Replace('# WINDOWSDLL', 'import os; os.add_dll_directory("D:/a/dolfinx/dolfinx-install/bin"); os.add_dll_directory("C:/Program Files (x86)/Intel/oneAPI/mpi/2021.12/opt/mpi/libfabric/bin")') | Set-Content __init__.py
+          (Get-Content __init__.py).Replace('# WINDOWSDLL', 'import os; os.add_dll_directory("${{ github.workspace }}/dolfinx-install/bin"); os.add_dll_directory("C:/Program Files (x86)/Intel/oneAPI/mpi/2021.12/opt/mpi/libfabric/bin")') | Set-Content __init__.py
           Get-Content __init__.py
 
       - uses: mpi4py/setup-mpi@v1.2.2

From 23c6ff1be5a676c42d66054839c4a382087fec65 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 11 Nov 2024 18:00:39 +0100
Subject: [PATCH 18/25] Fix.

---
 .github/workflows/windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 1f73089b5c..263498b083 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Insert add_dll_directory calls into Basix
         working-directory: basix/python/basix
         run: |
-          (Get-Content __init__.py).Replace('# WINDOWSDLL', 'import os; os.add_dll_directory("D:/a/dolfinx/basix-install/bin")') | Set-Content __init__.py
+          (Get-Content __init__.py).Replace('# WINDOWSDLL', 'import os; os.add_dll_directory("${{ github.workspace }}/basix-install/bin")') | Set-Content __init__.py
           Get-Content __init__.py
 
       - name: Install Basix (C++)

From b38761f0f68e3562fc7cb791f5cb9cc95fe68f39 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 18 Nov 2024 11:38:16 +0100
Subject: [PATCH 19/25] Tidy.

---
 .github/workflows/windows.yml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 263498b083..f9ef86138b 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -37,12 +37,6 @@ jobs:
       - name: Install UFL
         run: pip install git+https://github.com/FEniCS/ufl.git
 
-      - name: Checkout custom vcpkg triplets
-        uses: actions/checkout@v4
-        with:
-          repository: "Neumann-A/my-vcpkg-triplets"
-          path: vcpkg-triplets
-
       - name: Checkout Basix
         uses: actions/checkout@v4
         with:
@@ -58,19 +52,18 @@ jobs:
       - name: Install Basix (C++)
         working-directory: basix/cpp
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_TRIPLETS="$env:GITHUB_WORKSPACE/vcpkg-triplets" -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S .
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -B build-dir -S .
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix "$env:GITHUB_WORKSPACE/basix-install"
           echo "D:/a/dolfinx/basix-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
 
       - name: Install build dependencies (workaround)
         run: |
-          python -m pip install git+https://github.com/jhale/nanobind.git@jhale/msvc2022-workaround
-          python -m pip install scikit-build-core[pyproject] setuptools wheel
+          python -m pip install scikit-build-core[pyproject] setuptools wheel nanobind
       - name: Install Basix (Python)
         working-directory: basix/python
         run: |
-          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR="$env:GITHUB_WORKSPACE/basix-install/lib/cmake/basix" --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS="$env:GITHUB_WORKSPACE/vcpkg-triplets" --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
+          python -m pip -v install --check-build-dependencies --no-build-isolation --no-cache-dir .[ci] --config-settings=cmake.args=-DBasix_DIR="$env:GITHUB_WORKSPACE/basix-install/lib/cmake/basix"
 
       - name: Checkout FFCx
         uses: actions/checkout@v4
@@ -108,7 +101,7 @@ jobs:
       - name: Install DOLFINx (C++)
         working-directory: dolfinx
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build-dir -S cpp
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -B build-dir -S cpp
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/dolfinx-install
           echo "D:/a/dolfinx/dolfinx-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -116,7 +109,7 @@ jobs:
       - name: Build unit tests (C++)
         working-directory: dolfinx
         run: |
-          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -DVCPKG_OVERLAY_TRIPLETS=D:/a/dolfinx/vcpkg-triplets -DVCPKG_HOST_TRIPLET=x64-win-llvm -B build/test/ -S cpp/test/
+          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -B build/test/ -S cpp/test/
           cmake --build build/test --config Release --parallel 3
 
       - name: Run unit tests (C++, MPI, np=1)
@@ -136,7 +129,7 @@ jobs:
       - name: Install DOLFINx (Python)
         working-directory: dolfinx/python
         run: |
-          pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR=D:/a/dolfinx/basix-install/lib/cmake/basix --config-settings=cmake.args=-Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake --config-settings=cmake.args=-DDOLFINX_DIR=D:/a/dolfinx/dolfinx-install/lib/cmake/dolfinx --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake --config-settings=cmake.args=-DVCPKG_OVERLAY_PORTS="../cpp/.vcpkg-overlay" --config-settings=cmake.args=-DVCPKG_OVERLAY_TRIPLETS="../../vcpkg-triplets/" --config-settings=cmake.args=-DVCPKG_HOST_TRIPLET=x64-win-llvm
+          pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR=D:/a/dolfinx/basix-install/lib/cmake/basix --config-settings=cmake.args=-Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake --config-settings=cmake.args=-DDOLFINX_DIR=D:/a/dolfinx/dolfinx-install/lib/cmake/dolfinx --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
 
       - name: Run units tests (Python, serial)
         working-directory: dolfinx

From 027718d9bc9ee8f8bd31c7bc8d55bb9aab4a9d0a Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 18 Nov 2024 11:58:22 +0100
Subject: [PATCH 20/25] Try older cmake.

---
 .github/workflows/windows.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f9ef86138b..08e7409fd1 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -49,6 +49,11 @@ jobs:
           (Get-Content __init__.py).Replace('# WINDOWSDLL', 'import os; os.add_dll_directory("${{ github.workspace }}/basix-install/bin")') | Set-Content __init__.py
           Get-Content __init__.py
 
+      - name: Set up CMake
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: "~3.30.0"
+
       - name: Install Basix (C++)
         working-directory: basix/cpp
         run: |

From b9beef93b86d0223af0b43094f550ee8eaff7f1f Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 18 Nov 2024 12:29:15 +0100
Subject: [PATCH 21/25] Fixes.

---
 .github/workflows/windows.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 08e7409fd1..6cccb18d0e 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -106,7 +106,7 @@ jobs:
       - name: Install DOLFINx (C++)
         working-directory: dolfinx
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -B build-dir -S cpp
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR="$env:GITHUB_WORKSPACE/basix-install/lib/cmake/basix" -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR="$env:GITHUB_WORKSPACE/ufcx-install/share/ufcx/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -B build-dir -S cpp
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/dolfinx-install
           echo "D:/a/dolfinx/dolfinx-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -114,7 +114,7 @@ jobs:
       - name: Build unit tests (C++)
         working-directory: dolfinx
         run: |
-          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -B build/test/ -S cpp/test/
+          cmake -DBasix_DIR=D:/a/dolfinx/basix-install/share/basix -Dufcx_DIR="$env:GITHUB_WORKSPACE/ufcx-install/share/ufcx/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -B build/test/ -S cpp/test/
           cmake --build build/test --config Release --parallel 3
 
       - name: Run unit tests (C++, MPI, np=1)
@@ -134,7 +134,7 @@ jobs:
       - name: Install DOLFINx (Python)
         working-directory: dolfinx/python
         run: |
-          pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR=D:/a/dolfinx/basix-install/lib/cmake/basix --config-settings=cmake.args=-Dufcx_DIR=D:/a/dolfinx/ufcx-install/share/ufcx/cmake --config-settings=cmake.args=-DDOLFINX_DIR=D:/a/dolfinx/dolfinx-install/lib/cmake/dolfinx --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
+          pip -v install --check-build-dependencies --no-build-isolation .[test] --config-settings=cmake.args=-DBasix_DIR="$env:GITHUB_WORKSPACE/basix-install/lib/cmake/basix" --config-settings=cmake.args=-Dufcx_DIR="$env:GITHUB_WORKSPACE/ufcx-install/share/ufcx/cmake" --config-settings=cmake.args=-DDOLFINX_DIR="$env:GITHUB_WORKSPACE/dolfinx-install/lib/cmake/dolfinx" --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"
 
       - name: Run units tests (Python, serial)
         working-directory: dolfinx

From 035d7f71157e5d372cac60b4b290d475cbb2705f Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 18 Nov 2024 13:14:37 +0100
Subject: [PATCH 22/25] Fix.

---
 .github/workflows/windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 6cccb18d0e..7116b8b12f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -106,7 +106,7 @@ jobs:
       - name: Install DOLFINx (C++)
         working-directory: dolfinx
         run: |
-          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR="$env:GITHUB_WORKSPACE/basix-install/lib/cmake/basix" -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR="$env:GITHUB_WORKSPACE/ufcx-install/share/ufcx/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -B build-dir -S cpp
+          cmake -DINSTALL_RUNTIME_DEPENDENCIES=ON -DDOLFINX_BASIX_PYTHON=OFF -DBasix_DIR="$env:GITHUB_WORKSPACE/basix-install/lib/cmake/basix" -DDOLFINX_UFCX_PYTHON=OFF -Dufcx_DIR="$env:GITHUB_WORKSPACE/ufcx-install/share/ufcx/cmake" -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_PORTS="cpp/.vcpkg-overlay" -B build-dir -S cpp
           cmake --build build-dir --config Release
           cmake --install build-dir --config Release --prefix D:/a/dolfinx/dolfinx-install
           echo "D:/a/dolfinx/dolfinx-install/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

From d3f7adf7756568838db37c9fc899cf2a2c02f0eb Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 18 Nov 2024 13:20:51 +0100
Subject: [PATCH 23/25] Simplify.

---
 cpp/dolfinx/CMakeLists.txt | 41 +++++++++++++-------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/cpp/dolfinx/CMakeLists.txt b/cpp/dolfinx/CMakeLists.txt
index 7adaaeb73c..58cbf66246 100644
--- a/cpp/dolfinx/CMakeLists.txt
+++ b/cpp/dolfinx/CMakeLists.txt
@@ -152,41 +152,28 @@ endif()
 
 # ------------------------------------------------------------------------------
 # Install dolfinx library and header files
-if(WIN32)
-  install(
+install(
     TARGETS dolfinx
     EXPORT DOLFINXTargets
     RUNTIME_DEPENDENCY_SET dependencies
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeExecutables
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
-  )
+)
 
-  if(INSTALL_RUNTIME_DEPENDENCIES)
-    list(APPEND PRE_EXCLUDE_REGEXES "api-ms-.*")
-    list(APPEND PRE_EXCLUDE_REGEXES "ext-ms-.*")
-    install(
-      RUNTIME_DEPENDENCY_SET
-      dependencies
-      DESTINATION
-      ${CMAKE_INSTALL_BINDIR}
-      PRE_EXCLUDE_REGEXES
-      ${PRE_EXCLUDE_REGEXES}
-      POST_EXCLUDE_REGEXES
-      ".*system32/.*\\.dll"
-      DIRECTORIES
-      $<TARGET_FILE_DIR:Basix::basix>
-    )
-  endif()
-else()
+if(INSTALL_RUNTIME_DEPENDENCIES AND WIN32)
   install(
-    TARGETS dolfinx
-    EXPORT DOLFINXTargets
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeExecutables
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
-  )
-endif()
+    RUNTIME_DEPENDENCY_SET
+    dependencies
+    DESTINATION
+    ${CMAKE_INSTALL_BINDIR}
+    PRE_EXCLUDE_REGEXES
+    [[api-ms-win-.*]] [[ext-ms-.*]]
+    POST_EXCLUDE_REGEXES
+    [[.*(\\|/)system32(\\|/).*\.dll]]
+    DIRECTORIES
+    $<TARGET_FILE_DIR:Basix::basix>
+)
 
 # Generate DOLFINTargets.cmake
 install(EXPORT DOLFINXTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dolfinx)

From ce724890e6b15b77b110c909335a825fee9f24e9 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 18 Nov 2024 13:26:47 +0100
Subject: [PATCH 24/25] Revert.

---
 cpp/dolfinx/graph/ordering.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cpp/dolfinx/graph/ordering.cpp b/cpp/dolfinx/graph/ordering.cpp
index 187e88e529..df41220546 100644
--- a/cpp/dolfinx/graph/ordering.cpp
+++ b/cpp/dolfinx/graph/ordering.cpp
@@ -209,8 +209,7 @@ gps_reorder_unlabelled(const graph::AdjacencyList<std::int32_t>& graph,
   std::vector<std::array<int, 2>> lvp(n);
   for (int i = 0; i < k; ++i)
   {
-    std::span<int> lv_links = lv.links(i);
-    for (std::size_t w : lv_links)
+    for (int w : lv.links(i))
       lvp[w][0] = i;
     for (int w : lu.links(i))
       lvp[w][1] = k - 1 - i;

From 0a2649ba5ad91e3e695f1b62629e2253d64a5952 Mon Sep 17 00:00:00 2001
From: "Jack S. Hale" <mail@jackhale.co.uk>
Date: Mon, 18 Nov 2024 13:41:54 +0100
Subject: [PATCH 25/25] Try size_t

---
 cpp/dolfinx/CMakeLists.txt     | 3 ++-
 cpp/dolfinx/graph/ordering.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cpp/dolfinx/CMakeLists.txt b/cpp/dolfinx/CMakeLists.txt
index 58cbf66246..1632ac90b9 100644
--- a/cpp/dolfinx/CMakeLists.txt
+++ b/cpp/dolfinx/CMakeLists.txt
@@ -173,7 +173,8 @@ if(INSTALL_RUNTIME_DEPENDENCIES AND WIN32)
     [[.*(\\|/)system32(\\|/).*\.dll]]
     DIRECTORIES
     $<TARGET_FILE_DIR:Basix::basix>
-)
+  )
+endif()
 
 # Generate DOLFINTargets.cmake
 install(EXPORT DOLFINXTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dolfinx)
diff --git a/cpp/dolfinx/graph/ordering.cpp b/cpp/dolfinx/graph/ordering.cpp
index df41220546..e18770a7e5 100644
--- a/cpp/dolfinx/graph/ordering.cpp
+++ b/cpp/dolfinx/graph/ordering.cpp
@@ -209,10 +209,10 @@ gps_reorder_unlabelled(const graph::AdjacencyList<std::int32_t>& graph,
   std::vector<std::array<int, 2>> lvp(n);
   for (int i = 0; i < k; ++i)
   {
-    for (int w : lv.links(i))
-      lvp[w][0] = i;
-    for (int w : lu.links(i))
-      lvp[w][1] = k - 1 - i;
+    for (std::size_t w : lv.links(i))
+      (lvp[w])[0] = i;
+    for (std::size_t w : lu.links(i))
+      (lvp[w])[1] = k - 1 - i;
   }
 
   assert(lvp[v][0] == 0 and lvp[v][1] == 0);