From a03d58cb59bdd05ee49a91fe017a7559956b9a7c Mon Sep 17 00:00:00 2001
From: Patrick Shriwise <pshriwise@gmail.com>
Date: Thu, 26 Mar 2020 18:39:44 -0500
Subject: [PATCH] Updating build style for libmesh.

---
 CMakeLists.txt                  |  6 +-----
 cmake/Modules/FindLIBMESH.cmake | 13 ++++++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10cfd5aa03..f5bbf44280 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,9 +71,6 @@ else()
 #===============================================================================
 if(libmesh)
   find_package(LIBMESH REQUIRED)
-  set(LIBMESH_LIBRARIES mesh_devel timpi_devel netcdf)
-  set(LIBMESH_INCLUDE_DIRS "${LIBMESH}/../include/")
-  link_directories(${LIBMESH})
 endif()
 
 #===============================================================================
@@ -377,6 +374,7 @@ target_include_directories(libopenmc
     $<INSTALL_INTERFACE:include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     ${HDF5_INCLUDE_DIRS}
+    ${LIBMESH_INCLUDE_DIRECTORIES}
 )
 
 # Set compile flags
@@ -415,9 +413,7 @@ if(dagmc)
 endif()
 
 if(libmesh)
-  target_compile_definitions(libopenmc PRIVATE LIBMESH)
   target_link_libraries(libopenmc ${LIBMESH_LIBRARIES})
-  target_include_directories(libopenmc PRIVATE ${LIBMESH_INCLUDE_DIRS})
 endif()
 
 #===============================================================================
diff --git a/cmake/Modules/FindLIBMESH.cmake b/cmake/Modules/FindLIBMESH.cmake
index 3e813e9d76..1039e3e3bb 100644
--- a/cmake/Modules/FindLIBMESH.cmake
+++ b/cmake/Modules/FindLIBMESH.cmake
@@ -7,15 +7,14 @@
 #  LIBMESH_LIBRARIES - Link these to use LIBMESH
 #  LIBMESH_DEFINITIONS - Compiler switches required for using LIBMESH
 
-find_path(LIBMESH NAMES libmesh_opt.so
+find_path(LIBMESH_PC NAMES libmesh-opt.pc
           HINTS ${LIBMESH_ROOT} $ENV{LIBMESH_ROOT}
           PATHS ENV LD_LIBRARY_PATH
-          PATH_SUFFIXES lib Lib
+          PATH_SUFFIXES lib/pkgconfig pkgconfig
           NO_DEFAULT_PATH)
 
-if(DEFINED LIBMESH)
-  set(LIBMESH_FOUND TRUE)
-endif()
+include(FindPkgConfig)
+set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${LIBMESH_PC}")
+pkg_check_modules(LIBMESH REQUIRED libmesh IMPORTED_TARGET)
 
-
-message(STATUS "Found LIBMESH in ${LIBMESH}")
+message(STATUS "Found LIBMESH in ${LIBMESH_PC}")