From 27494e5f91fa2e87f28d0c89a44850bdf39b9887 Mon Sep 17 00:00:00 2001 From: Connor Ward Date: Fri, 22 Nov 2024 07:14:54 +0000 Subject: [PATCH] fixups --- .github/workflows/pip.yml | 6 +++--- setup.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index f383eadc85..0ba7007e99 100644 --- a/.github/workflows/pip.yml +++ b/.github/workflows/pip.yml @@ -48,7 +48,9 @@ jobs: run: rm -rf pip_venv - name: Create a venv - run: python3 -m venv pip_venv + run: | + python3 -m venv pip_venv + ln -s /__w/firedrake/firedrake/src pip_venv/ - uses: actions/checkout@v4 with: @@ -58,7 +60,6 @@ jobs: run: | source pip_venv/bin/activate python -m pip install 'rtree>=1.2' - mkdir -p pip_venv/src cd pip_venv/src git clone https://github.com/firedrakeproject/libsupermesh.git cd libsupermesh @@ -77,7 +78,6 @@ jobs: - name: Pip install run: | - ln -s /__w/firedrake/firedrake/src pip_venv/ source pip_venv/bin/activate cd pip_venv/src export CC="$MPICH_DIR/mpicc" diff --git a/setup.py b/setup.py index 32f5b71b73..21ab9f28ab 100644 --- a/setup.py +++ b/setup.py @@ -156,6 +156,8 @@ def __getitem__(self, key): # -lsupermesh \ # -Wl,-rpath,$ORIGIN/../../supermesh supermesh_ = ExternalDependency( + include_dirs=[sys.prefix], + library_dirs=[sys.prefix], libraries=["supermesh"], )