From fb3aaa46ac6dac05315c7fe84c3f105fbb74ae46 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 10 Oct 2024 22:05:32 +0600
Subject: [PATCH] Improve Detection of libMesh Installation via `LIBMESH_ROOT`
 and CMake's PkgConfig (#3149)

---
 .github/workflows/ci.yml        | 1 -
 cmake/Modules/FindLIBMESH.cmake | 4 ++--
 tools/ci/gha-install-libmesh.sh | 1 -
 tools/ci/gha-install.py         | 7 ++++---
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c67f19359..5973c3cd4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,7 +96,6 @@ jobs:
 
       - name: Environment Variables
         run: |
-          echo "DAGMC_ROOT=$HOME/DAGMC"
           echo "OPENMC_CROSS_SECTIONS=$HOME/nndc_hdf5/cross_sections.xml" >> $GITHUB_ENV
           echo "OPENMC_ENDF_DATA=$HOME/endf-b-vii.1" >> $GITHUB_ENV
 
diff --git a/cmake/Modules/FindLIBMESH.cmake b/cmake/Modules/FindLIBMESH.cmake
index 048dfc2a8..df9208c18 100644
--- a/cmake/Modules/FindLIBMESH.cmake
+++ b/cmake/Modules/FindLIBMESH.cmake
@@ -15,7 +15,7 @@ if(DEFINED ENV{METHOD})
 endif()
 
 find_package(PkgConfig REQUIRED)
-set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${LIBMESH_PC}")
-set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH True)
+
+set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
 pkg_check_modules(LIBMESH REQUIRED ${LIBMESH_PC_FILE}>=1.7.0 IMPORTED_TARGET)
 pkg_get_variable(LIBMESH_PREFIX ${LIBMESH_PC_FILE} prefix)
diff --git a/tools/ci/gha-install-libmesh.sh b/tools/ci/gha-install-libmesh.sh
index cb808ae5b..d4557d2d3 100755
--- a/tools/ci/gha-install-libmesh.sh
+++ b/tools/ci/gha-install-libmesh.sh
@@ -16,7 +16,6 @@ else
     ../libmesh/configure --prefix=$HOME/LIBMESH --enable-exodus --disable-netcdf-4 --disable-eigen --disable-lapack --disable-mpi
 fi
 make -j4 install
-export LIBMESH_PC=$HOME/LIBMESH/lib/pkgconfig/
 rm -rf $HOME/LIBMESH/build
 
 popd
diff --git a/tools/ci/gha-install.py b/tools/ci/gha-install.py
index f046e8634..282389a8f 100644
--- a/tools/ci/gha-install.py
+++ b/tools/ci/gha-install.py
@@ -31,7 +31,8 @@ def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False, ncrys
 
     if dagmc:
         cmake_cmd.append('-DOPENMC_USE_DAGMC=ON')
-        cmake_cmd.append('-DCMAKE_PREFIX_PATH=~/DAGMC')
+        dagmc_path = os.environ.get('HOME') + '/DAGMC'
+        cmake_cmd.append('-DCMAKE_PREFIX_PATH=' + dagmc_path)
 
     if libmesh:
         cmake_cmd.append('-DOPENMC_USE_LIBMESH=ON')
@@ -40,8 +41,8 @@ def install(omp=False, mpi=False, phdf5=False, dagmc=False, libmesh=False, ncrys
 
     if ncrystal:
         cmake_cmd.append('-DOPENMC_USE_NCRYSTAL=ON')
-        ncrystal_cmake_path = os.environ.get('HOME') + '/ncrystal_inst/lib/cmake'
-        cmake_cmd.append(f'-DCMAKE_PREFIX_PATH={ncrystal_cmake_path}')
+        ncrystal_path = os.environ.get('HOME') + '/ncrystal_inst'
+        cmake_cmd.append(f'-DCMAKE_PREFIX_PATH={ncrystal_path}')
 
     # Build in coverage mode for coverage testing
     cmake_cmd.append('-DOPENMC_ENABLE_COVERAGE=on')