From b9e8f1324e72dc4730185b5f1f350eea62ab6757 Mon Sep 17 00:00:00 2001
From: Jose Ignacio Marquez Damian <marquezj@ess.eu>
Date: Fri, 18 Nov 2022 22:40:46 +0100
Subject: [PATCH] Attempt to fix NCrystal installation script

---
 tools/ci/gha-install-ncrystal.sh | 4 ++++
 tools/ci/gha-install.py          | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/ci/gha-install-ncrystal.sh b/tools/ci/gha-install-ncrystal.sh
index c18087f235..5f577b8da9 100755
--- a/tools/ci/gha-install-ncrystal.sh
+++ b/tools/ci/gha-install-ncrystal.sh
@@ -28,6 +28,7 @@ cmake \
     -DEMBED_DATA=ON \
     -DINSTALL_DATA=OFF \
     -DNO_DIRECT_PYMODINST=ON \
+    -DCMAKE_INSTALL_PREFIX="${INST_DIR}" \
     -DPython3_EXECUTABLE="$PYTHON"
 
 make -j${CPU_COUNT:-1}
@@ -60,3 +61,6 @@ liblocation = pathlib.Path('${TMPNCRYSTALLIBLOCATION}'.strip())
 EOF
 
 $PYTHON -m pip install ./ncrystal_pypkg/ -vv
+
+setup ${INST_DIR}/setup.sh
+
diff --git a/tools/ci/gha-install.py b/tools/ci/gha-install.py
index 4c69ba70b0..f3a29273f6 100644
--- a/tools/ci/gha-install.py
+++ b/tools/ci/gha-install.py
@@ -19,7 +19,7 @@ def which(program):
     return None
 
 
-def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False):
+def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False, ncrystal=False):
     # Create build directory and change to it
     shutil.rmtree('build', ignore_errors=True)
     os.mkdir('build')
@@ -54,6 +54,9 @@ def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False):
         libmesh_path = os.environ.get('HOME') + '/LIBMESH'
         cmake_cmd.append('-DCMAKE_PREFIX_PATH=' + libmesh_path)
 
+    if ncrystal:
+        cmake_cmd.append('-DOPENMC_USE_NCRYSTAL=ON')
+
     # Build in coverage mode for coverage testing
     cmake_cmd.append('-DOPENMC_ENABLE_COVERAGE=on')
 
@@ -70,10 +73,11 @@ def main():
     mpi = (os.environ.get('MPI') == 'y')
     phdf5 = (os.environ.get('PHDF5') == 'y')
     dagmc = (os.environ.get('DAGMC') == 'y')
+    ncrystal = (os.environ.get('NCRYSTAL') == 'y')
     libmesh = (os.environ.get('LIBMESH') == 'y')
 
     # Build and install
-    install(omp, mpi, phdf5, dagmc, libmesh)
+    install(omp, mpi, phdf5, dagmc, libmesh, ncrystal)
 
 if __name__ == '__main__':
     main()