From eeab41a19d8bbe1617f6abb63ff8bb2f89dd24f3 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Thu, 22 Dec 2022 14:03:26 -0600
Subject: [PATCH] Build against MCPL in CI by default

---
 tools/ci/gha-install.py | 12 ++++--------
 tools/ci/gha-install.sh |  6 ++----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/tools/ci/gha-install.py b/tools/ci/gha-install.py
index ea317b5f0..83e5afac7 100644
--- a/tools/ci/gha-install.py
+++ b/tools/ci/gha-install.py
@@ -19,14 +19,14 @@ def which(program):
     return None
 
 
-def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False, mcpl=False):
+def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False):
     # Create build directory and change to it
     shutil.rmtree('build', ignore_errors=True)
     os.mkdir('build')
     os.chdir('build')
 
-    # Build in debug mode by default
-    cmake_cmd = ['cmake', '-DCMAKE_BUILD_TYPE=Debug']
+    # Build in debug mode by default with support for MCPL
+    cmake_cmd = ['cmake', '-DCMAKE_BUILD_TYPE=Debug', '-DOPENMC_USE_MCPL=on']
 
     # Turn off OpenMP if specified
     if not omp:
@@ -54,9 +54,6 @@ def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False, mcpl=
         libmesh_path = os.environ.get('HOME') + '/LIBMESH'
         cmake_cmd.append('-DCMAKE_PREFIX_PATH=' + libmesh_path)
 
-    if mcpl:
-        cmake_cmd.append('-DOPENMC_USE_MCPL=ON')
-
     # Build in coverage mode for coverage testing
     cmake_cmd.append('-DOPENMC_ENABLE_COVERAGE=on')
 
@@ -74,10 +71,9 @@ def main():
     phdf5 = (os.environ.get('PHDF5') == 'y')
     dagmc = (os.environ.get('DAGMC') == 'y')
     libmesh = (os.environ.get('LIBMESH') == 'y')
-    mcpl = (os.environ.get('MCPL') == 'y')
 
     # Build and install
-    install(omp, mpi, phdf5, dagmc, libmesh, mcpl)
+    install(omp, mpi, phdf5, dagmc, libmesh)
 
 if __name__ == '__main__':
     main()
diff --git a/tools/ci/gha-install.sh b/tools/ci/gha-install.sh
index 68e825d48..75fa0ca70 100755
--- a/tools/ci/gha-install.sh
+++ b/tools/ci/gha-install.sh
@@ -27,10 +27,8 @@ if [[ $LIBMESH = 'y' ]]; then
     ./tools/ci/gha-install-libmesh.sh
 fi
 
-# Install mcpl if needed
-if [[ $MCPL = 'y' ]]; then
-    ./tools/ci/gha-install-mcpl.sh
-fi
+# Install MCPL
+./tools/ci/gha-install-mcpl.sh
 
 # For MPI configurations, make sure mpi4py and h5py are built against the
 # correct version of MPI