From 8d9070b2c5009ca1546473dda8356b3a4729ff53 Mon Sep 17 00:00:00 2001
From: Jack Betteridge <j.betteridge@imperial.ac.uk>
Date: Thu, 24 Oct 2024 17:30:12 +0100
Subject: [PATCH 01/13] Setup Python changing environment

---
 .github/workflows/build.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 81ea1b2..e1ce21a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -79,11 +79,7 @@ jobs:
         run: |
           source ../test/bin/activate
           cd build
-          unset pythonLocation
-          unset Python_ROOT_DIR
-          unset Python2_ROOT_DIR
-          unset Python3_ROOT_DIR
-          cmake .. \
+          env Python3_ROOT_DIR="" Python3_ROOT_DIR="" cmake .. \
             -DBUILD_SHARED_LIBS=ON \
             -DMPI_C_COMPILER=$MPICH_DIR/mpicc \
             -DMPI_CXX_COMPILER=$MPICH_DIR/mpicxx \

From 1b86f3d6224f616a71de733720d0461a5af54a96 Mon Sep 17 00:00:00 2001
From: Jack Betteridge <j.betteridge@imperial.ac.uk>
Date: Thu, 24 Oct 2024 17:35:55 +0100
Subject: [PATCH 02/13] More complicated still

---
 .github/workflows/build.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e1ce21a..df17dd8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,14 +63,16 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
+        id: python311
         with:
           python-version: '3.11'
+          update-environment: false
 
       - name: Install Rtree
         shell: bash
         run: |
           cd ..
-          python -m venv test
+          ${{ steps.python311.outputs.python-path }} -m venv test
           source test/bin/activate
           pip install "rtree>=1.2"
 
@@ -79,7 +81,7 @@ jobs:
         run: |
           source ../test/bin/activate
           cd build
-          env Python3_ROOT_DIR="" Python3_ROOT_DIR="" cmake .. \
+          cmake .. \
             -DBUILD_SHARED_LIBS=ON \
             -DMPI_C_COMPILER=$MPICH_DIR/mpicc \
             -DMPI_CXX_COMPILER=$MPICH_DIR/mpicxx \

From 4f18cbc6617a3c9c5cae553d5f1add2d022a1a3f Mon Sep 17 00:00:00 2001
From: Jack Betteridge <j.betteridge@imperial.ac.uk>
Date: Thu, 24 Oct 2024 17:45:41 +0100
Subject: [PATCH 03/13] Try a different tactic

---
 .github/workflows/build.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df17dd8..81ea1b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -63,16 +63,14 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-python@v4
-        id: python311
         with:
           python-version: '3.11'
-          update-environment: false
 
       - name: Install Rtree
         shell: bash
         run: |
           cd ..
-          ${{ steps.python311.outputs.python-path }} -m venv test
+          python -m venv test
           source test/bin/activate
           pip install "rtree>=1.2"
 
@@ -81,6 +79,10 @@ jobs:
         run: |
           source ../test/bin/activate
           cd build
+          unset pythonLocation
+          unset Python_ROOT_DIR
+          unset Python2_ROOT_DIR
+          unset Python3_ROOT_DIR
           cmake .. \
             -DBUILD_SHARED_LIBS=ON \
             -DMPI_C_COMPILER=$MPICH_DIR/mpicc \

From 6da26f49ae1bb9325db82d69c9736980464d7df8 Mon Sep 17 00:00:00 2001
From: Jack Betteridge <j.betteridge@imperial.ac.uk>
Date: Fri, 25 Oct 2024 16:45:16 +0100
Subject: [PATCH 04/13] Add a pyproject.toml

---
 AUTHORS        |  1 +
 README.md      |  1 +
 pyproject.toml | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 pyproject.toml

diff --git a/AUTHORS b/AUTHORS
index ade4ac3..8fecedf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,3 +6,4 @@ Contributors to libsupermesh:
 * Dr. Patrick E. Farrell, Mathematical Institute, University of Oxford, UK,
   and Center for Biomedical Computing, Simula Research Laboratory, Oslo, Norway
 * Mr. Matteo Croci, Mathematical Institute, University of Oxford, UK
+* Dr. Jack Betteridge, Department of Mathematics, Imperial College London, UK
diff --git a/README.md b/README.md
index dcf15f5..4b5c809 100644
--- a/README.md
+++ b/README.md
@@ -29,3 +29,4 @@ libsupermesh is available under the [GNU Lesser General Public License version 2
 * Dr. Patrick E. Farrell, Mathematical Institute, University of Oxford, UK,
   and Center for Biomedical Computing, Simula Research Laboratory, Oslo, Norway
 * Mr. Matteo Croci, Mathematical Institute, University of Oxford, UK
+* Dr. Jack Betteridge, Department of Mathematics, Imperial College London, UK
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..d7c197e
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,32 @@
+[project]
+name = "libsupermesh"
+version = "1.0.1"
+description = "A parallel supermeshing library"
+readme = "README.md"
+authors = [
+  {name = "James R. Maddison", email = "j.r.maddison@ed.ac.uk"},
+  {name = "Iakovos Panourgias", email = ""},
+  {name = "Patrick E. Farrell", email = ""},
+  {name = "Matteo Croci", email = ""},
+  {name = "Jack Betteridge", email = "J.Betteridge@imperial.ac.uk"},
+]
+maintainers = [
+  {name = "Jack Betteridge", email = "J.Betteridge@imperial.ac.uk"},
+]
+dependencies = [
+  "rtree>=1.2",
+]
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)",
+  "Programming Language :: Python",
+  "Operating System :: OS Independent"
+]
+
+[project.urls]
+Repository = "https://github.com/firedrakeproject/libsupermesh"
+
+[build-system]
+requires = ["scikit-build-core"]
+build-backend = "scikit_build_core.build"
+

From a76efa97838eda9cb92a1a29ca11acd7cb62d150 Mon Sep 17 00:00:00 2001
From: Jack Betteridge <j.betteridge@imperial.ac.uk>
Date: Fri, 25 Oct 2024 20:58:48 +0100
Subject: [PATCH 05/13] WIP

---
 CMakeLists.txt | 95 ++++++++++++++++++++++++++++++++++----------------
 pyproject.toml |  2 +-
 2 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc62c53..8002d44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,11 @@ set(CMAKE_Fortran_MODULE_DIRECTORY ${LIBSUPERMESH_BINARY_DIR}/include)
 include_directories(${LIBSUPERMESH_SOURCE_DIR}/include)
 include_directories(${LIBSUPERMESH_BINARY_DIR}/include)
 include_directories(${LIBSUPERMESH_BINARY_DIR}/include_local)
-option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
+if(${SKBUILD} STREQUAL 2)
+  option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+else()
+  option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
+endif()
 
 find_package(MPI REQUIRED)
 set(link_libraries ${MPI_Fortran_LIBRARIES})
@@ -127,7 +131,7 @@ message(STATUS "")
 
 # Python is not required, but we want to add pip packages to spatialindex search path
 set(Python_FIND_VIRTUALENV "FIRST")
-find_package(Python)
+find_package(Python COMPONENTS Interpreter Development.Module)
 if(Python_FOUND)
     message(STATUS "Python_VERSION_MAJOR " ${Python_VERSION_MAJOR})
     message(STATUS "Python_VERSION_MINOR " ${Python_VERSION_MINOR})
@@ -184,35 +188,58 @@ if(spatialindexheaders)
 endif()
 
 file(GLOB source_files ${LIBSUPERMESH_SOURCE_DIR}/src/*.F90 ${LIBSUPERMESH_SOURCE_DIR}/src/*.c ${LIBSUPERMESH_SOURCE_DIR}/src/*.cpp)
-add_library(supermesh ${source_files})
+if(${SKBUILD} STREQUAL 2)
+  python_add_library(supermesh MODULE WITH_SOABI ${source_files})
+else()
+  add_library(supermesh ${source_files})
+endif()
 
-set(test_main ${LIBSUPERMESH_SOURCE_DIR}/src/tests/test_main.cpp)
-file(GLOB unittest_files ${LIBSUPERMESH_SOURCE_DIR}/src/tests/*.F90)
-set(unittests "")
-foreach(unittest_file ${unittest_files})
-  get_filename_component(unittest ${unittest_file} NAME_WE)
-  add_executable(${unittest} ${unittest_file} ${test_main})
-  list(APPEND unittests ${unittest})
-  set_property(TARGET ${unittest} PROPERTY COMPILE_DEFINITIONS "TESTNAME=${unittest}")
-  if(unittest MATCHES parallel)
-    add_test(${unittest} ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./${unittest} ${MPIEXEC_POSTFLAGS})
-  else()
-    add_test(${unittest} ${unittest})
-  endif()
-  set_tests_properties(${unittest} PROPERTIES FAIL_REGULAR_EXPRESSION "Fail:")
-endforeach()
+target_link_libraries(supermesh PUBLIC ${link_libraries})
+#~ set_target_properties(supermesh PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
+#~ set_target_properties(supermesh PROPERTIES INSTALL_RPATH ${link_libraries})
+set_target_properties(supermesh PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
+if(${SKBUILD} STREQUAL 2)
+  # use, i.e. don't skip the full RPATH for the build tree
+  set(CMAKE_SKIP_BUILD_RPATH FALSE)
 
-set(test_link_libraries supermesh ${link_libraries} ${MPI_CXX_LIBRARIES})
-target_link_libraries(supermesh ${link_libraries})
-set_target_properties(supermesh PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
-foreach(test ${unittests})
-  target_link_libraries(${test} ${test_link_libraries})
-endforeach()
+  # when building, don't use the install RPATH already
+  # (but later on when installing)
+  set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
-set_target_properties(supermesh PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
-foreach(unittest ${unittests})
-  set_target_properties(${unittest} PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS} ${MPI_CXX_LINK_FLAGS}")
-endforeach()
+  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+
+  # add the automatically determined parts of the RPATH
+  # which point to directories outside the build tree to the install RPATH
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif()
+
+# Only build tests if not built by scikit-build-core
+if(NOT ${SKBUILD} STREQUAL 2)
+  set(test_main ${LIBSUPERMESH_SOURCE_DIR}/src/tests/test_main.cpp)
+  file(GLOB unittest_files ${LIBSUPERMESH_SOURCE_DIR}/src/tests/*.F90)
+  set(unittests "")
+  foreach(unittest_file ${unittest_files})
+    get_filename_component(unittest ${unittest_file} NAME_WE)
+    add_executable(${unittest} ${unittest_file} ${test_main})
+    list(APPEND unittests ${unittest})
+    set_property(TARGET ${unittest} PROPERTY COMPILE_DEFINITIONS "TESTNAME=${unittest}")
+    if(unittest MATCHES parallel)
+      add_test(${unittest} ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} ./${unittest} ${MPIEXEC_POSTFLAGS})
+    else()
+      add_test(${unittest} ${unittest})
+    endif()
+    set_tests_properties(${unittest} PROPERTIES FAIL_REGULAR_EXPRESSION "Fail:")
+  endforeach()
+
+  set(test_link_libraries supermesh ${link_libraries} ${MPI_CXX_LIBRARIES})
+  foreach(test ${unittests})
+    target_link_libraries(${test} ${test_link_libraries})
+  endforeach()
+
+  foreach(unittest ${unittests})
+    set_target_properties(${unittest} PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS} ${MPI_CXX_LINK_FLAGS}")
+  endforeach()
+endif()
 
 configure_file (
   "${LIBSUPERMESH_SOURCE_DIR}/config/libsupermesh.pc.in"
@@ -246,9 +273,15 @@ if(ENABLE_DOCS)
     FORCE_PDF EXCLUDE_FROM_ALL BIBFILES doc/bibliography.bib)
 endif()
 
-install(TARGETS supermesh DESTINATION lib)
-install(DIRECTORY ${LIBSUPERMESH_BINARY_DIR}/include DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(FILES ${LIBSUPERMESH_BINARY_DIR}/config/libsupermesh.pc DESTINATION lib/pkgconfig)
+if(${SKBUILD} STREQUAL 2)
+  install(TARGETS supermesh DESTINATION supermesh)
+  install(DIRECTORY ${LIBSUPERMESH_BINARY_DIR}/include DESTINATION supermesh)
+  install(FILES ${LIBSUPERMESH_BINARY_DIR}/config/libsupermesh.pc DESTINATION supermesh/lib/pkgconfig)
+else()
+  install(TARGETS supermesh DESTINATION lib)
+  install(DIRECTORY ${LIBSUPERMESH_BINARY_DIR}/include DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install(FILES ${LIBSUPERMESH_BINARY_DIR}/config/libsupermesh.pc DESTINATION lib/pkgconfig)
+endif()
 
 file(GLOB data_files ${LIBSUPERMESH_SOURCE_DIR}/src/tests/data/*.ele
                      ${LIBSUPERMESH_SOURCE_DIR}/src/tests/data/*.node)
diff --git a/pyproject.toml b/pyproject.toml
index d7c197e..c62f317 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,6 +27,6 @@ classifiers = [
 Repository = "https://github.com/firedrakeproject/libsupermesh"
 
 [build-system]
-requires = ["scikit-build-core"]
+requires = ["scikit-build-core", "rtree>=1.2"]
 build-backend = "scikit_build_core.build"
 

From 8def6ae5fbc5f4fed978a536f056289d4a52404c Mon Sep 17 00:00:00 2001
From: Jack Betteridge <j.betteridge@imperial.ac.uk>
Date: Mon, 28 Oct 2024 22:34:55 +0000
Subject: [PATCH 06/13] pip install supermesh?

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8002d44..5fb8bb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,7 +196,7 @@ endif()
 
 target_link_libraries(supermesh PUBLIC ${link_libraries})
 #~ set_target_properties(supermesh PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
-#~ set_target_properties(supermesh PROPERTIES INSTALL_RPATH ${link_libraries})
+set_target_properties(supermesh PROPERTIES INSTALL_RPATH "$ORIGIN/../Rtree.libs")
 set_target_properties(supermesh PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
 if(${SKBUILD} STREQUAL 2)
   # use, i.e. don't skip the full RPATH for the build tree
@@ -276,7 +276,6 @@ endif()
 if(${SKBUILD} STREQUAL 2)
   install(TARGETS supermesh DESTINATION supermesh)
   install(DIRECTORY ${LIBSUPERMESH_BINARY_DIR}/include DESTINATION supermesh)
-  install(FILES ${LIBSUPERMESH_BINARY_DIR}/config/libsupermesh.pc DESTINATION supermesh/lib/pkgconfig)
 else()
   install(TARGETS supermesh DESTINATION lib)
   install(DIRECTORY ${LIBSUPERMESH_BINARY_DIR}/include DESTINATION ${CMAKE_INSTALL_PREFIX})

From 2243c945620581968a54662a402c103eb1f5c267 Mon Sep 17 00:00:00 2001
From: Jack Betteridge <j.betteridge@imperial.ac.uk>
Date: Mon, 28 Oct 2024 22:51:17 +0000
Subject: [PATCH 07/13] More magic

---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fb8bb7..845fd99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,6 +156,11 @@ if((NOT spatialindexlib) AND (Python_FOUND))
     # Forces build to fail if we still cannot find spatialindex
     unset(spatialindexlib)
     find_library(spatialindexlib NAMES spatialindex REQUIRED)
+  else()
+    # Get the headers
+    execute_process(COMMAND ${Python_EXECUTABLE} -c "import rtree; print(rtree.finder.get_include(), end='')"
+                  OUTPUT_VARIABLE spatialindexheaders
+                  )
   endif()
 endif()
 
@@ -180,7 +185,7 @@ endif()
 find_path(spatialindexheaders
           NAMES spatialindex/SpatialIndex.h
           REQUIRED
-          PATHS /usr/local/include /usr/include $ENV{VIRTUAL_ENV}/lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages/rtree/include
+          PATHS /usr/local/include /usr/include $ENV{VIRTUAL_ENV}/lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages/rtree/include spatialindexheaders
           )
 if(spatialindexheaders)
   message(STATUS "Found libspatialindex headers: " ${spatialindexheaders})

From 4567eb7045ab1067e183f3ba5e1878ce733878d6 Mon Sep 17 00:00:00 2001
From: Jack Betteridge <j.betteridge@imperial.ac.uk>
Date: Mon, 28 Oct 2024 22:54:11 +0000
Subject: [PATCH 08/13] Add quotes

---
 CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 845fd99..e9e560a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(CMAKE_Fortran_MODULE_DIRECTORY ${LIBSUPERMESH_BINARY_DIR}/include)
 include_directories(${LIBSUPERMESH_SOURCE_DIR}/include)
 include_directories(${LIBSUPERMESH_BINARY_DIR}/include)
 include_directories(${LIBSUPERMESH_BINARY_DIR}/include_local)
-if(${SKBUILD} STREQUAL 2)
+if("${SKBUILD}" STREQUAL 2)
   option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 else()
   option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
@@ -193,7 +193,7 @@ if(spatialindexheaders)
 endif()
 
 file(GLOB source_files ${LIBSUPERMESH_SOURCE_DIR}/src/*.F90 ${LIBSUPERMESH_SOURCE_DIR}/src/*.c ${LIBSUPERMESH_SOURCE_DIR}/src/*.cpp)
-if(${SKBUILD} STREQUAL 2)
+if("${SKBUILD}" STREQUAL 2)
   python_add_library(supermesh MODULE WITH_SOABI ${source_files})
 else()
   add_library(supermesh ${source_files})
@@ -203,7 +203,7 @@ target_link_libraries(supermesh PUBLIC ${link_libraries})
 #~ set_target_properties(supermesh PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
 set_target_properties(supermesh PROPERTIES INSTALL_RPATH "$ORIGIN/../Rtree.libs")
 set_target_properties(supermesh PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
-if(${SKBUILD} STREQUAL 2)
+if("${SKBUILD}" STREQUAL 2)
   # use, i.e. don't skip the full RPATH for the build tree
   set(CMAKE_SKIP_BUILD_RPATH FALSE)
 
@@ -219,7 +219,7 @@ if(${SKBUILD} STREQUAL 2)
 endif()
 
 # Only build tests if not built by scikit-build-core
-if(NOT ${SKBUILD} STREQUAL 2)
+if(NOT "${SKBUILD}" STREQUAL 2)
   set(test_main ${LIBSUPERMESH_SOURCE_DIR}/src/tests/test_main.cpp)
   file(GLOB unittest_files ${LIBSUPERMESH_SOURCE_DIR}/src/tests/*.F90)
   set(unittests "")
@@ -278,7 +278,7 @@ if(ENABLE_DOCS)
     FORCE_PDF EXCLUDE_FROM_ALL BIBFILES doc/bibliography.bib)
 endif()
 
-if(${SKBUILD} STREQUAL 2)
+if("${SKBUILD}" STREQUAL 2)
   install(TARGETS supermesh DESTINATION supermesh)
   install(DIRECTORY ${LIBSUPERMESH_BINARY_DIR}/include DESTINATION supermesh)
 else()

From 52cbebd6592abd36593d6851b2ede554effca016 Mon Sep 17 00:00:00 2001
From: Connor Ward <c.ward20@imperial.ac.uk>
Date: Mon, 18 Nov 2024 17:03:28 +0000
Subject: [PATCH 09/13] Add testing pip install

---
 .github/workflows/build.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 81ea1b2..616d540 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -102,3 +102,27 @@ jobs:
         run: |
           cd build
           make test
+
+  # NOTE: The pip-installed version of libsupermesh does not include any tests, so only check
+  # that it builds.
+  build_pip:
+    name: "Build libsupermesh with pip"
+    # The type of runner that the job will run on
+    runs-on: self-hosted
+    # The docker container to use.
+    container:
+      image: firedrakeproject/firedrake-env:latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Install libsupermesh
+        shell: bash
+        run: |
+          python -m venv ../test_env
+          source ../test_env/bin/activate
+          pip install .

From da264b689ef8b5da0d6c5338b7c0c886d38af3c1 Mon Sep 17 00:00:00 2001
From: Connor Ward <c.ward20@imperial.ac.uk>
Date: Mon, 18 Nov 2024 17:03:52 +0000
Subject: [PATCH 10/13] cleanup cmakelist

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9e560a..21af648 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,7 +200,6 @@ else()
 endif()
 
 target_link_libraries(supermesh PUBLIC ${link_libraries})
-#~ set_target_properties(supermesh PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
 set_target_properties(supermesh PROPERTIES INSTALL_RPATH "$ORIGIN/../Rtree.libs")
 set_target_properties(supermesh PROPERTIES LINK_FLAGS "${MPI_Fortran_LINK_FLAGS}")
 if("${SKBUILD}" STREQUAL 2)

From d2cb82e861ef2ae784ecc7623fc9aea16252b289 Mon Sep 17 00:00:00 2001
From: Connor Ward <c.ward20@imperial.ac.uk>
Date: Mon, 18 Nov 2024 17:08:37 +0000
Subject: [PATCH 11/13] Add env

---
 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 616d540..6258a06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -122,6 +122,8 @@ jobs:
 
       - name: Install libsupermesh
         shell: bash
+        env:
+          MPI_HOME: $MPICH_DIR
         run: |
           python -m venv ../test_env
           source ../test_env/bin/activate

From fee39eed0da31b742021572351228a7d34e161e4 Mon Sep 17 00:00:00 2001
From: Connor Ward <c.ward20@imperial.ac.uk>
Date: Mon, 18 Nov 2024 17:15:12 +0000
Subject: [PATCH 12/13] testing

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6258a06..b427143 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -123,7 +123,7 @@ jobs:
       - name: Install libsupermesh
         shell: bash
         env:
-          MPI_HOME: $MPICH_DIR
+          MPI_HOME: ${{ env.MPICH_DIR }}
         run: |
           python -m venv ../test_env
           source ../test_env/bin/activate

From 10179871ee8d8a3e149b41336964da186d3e11b7 Mon Sep 17 00:00:00 2001
From: Connor Ward <c.ward20@imperial.ac.uk>
Date: Mon, 18 Nov 2024 17:21:56 +0000
Subject: [PATCH 13/13] testing

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b427143..17f54c2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -122,9 +122,8 @@ jobs:
 
       - name: Install libsupermesh
         shell: bash
-        env:
-          MPI_HOME: ${{ env.MPICH_DIR }}
         run: |
           python -m venv ../test_env
           source ../test_env/bin/activate
+          export MPI_HOME=$MPICH_DIR
           pip install .