Ensuring that all necessary information makes it into the OpeMCconfig…

… file for linked applicatoins.
kadircs · Apr 8, 2021 · 18a1ba1 · 18a1ba1
1 parent 0b61d14
commit 18a1ba1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmake/Modules/FindLIBMESH.cmake b/cmake/Modules/FindLIBMESH.cmake
@@ -18,3 +18,4 @@ include(FindPkgConfig)
 set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${LIBMESH_PC}")
 set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH True)
 pkg_check_modules(LIBMESH REQUIRED ${LIBMESH_PC_FILE}>=1.6.0 IMPORTED_TARGET)
+pkg_get_variable(LIBMESH_PREFIX ${LIBMESH_PC_FILE} prefix)
diff --git a/cmake/OpenMCConfig.cmake.in b/cmake/OpenMCConfig.cmake.in
@@ -11,8 +11,9 @@ endif()
 
 if(@LIBMESH_FOUND@)
   include(FindPkgConfig)
-  set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:@LIBMESH_PC@")
-  pkg_check_modules(LIBMESH REQUIRED libmesh IMPORTED_TARGET)
+  list(APPEND CMAKE_PREFIX_PATH @LIBMESH_PREFIX@)
+  set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH True)
+  pkg_check_modules(LIBMESH REQUIRED @LIBMESH_PC_FILE@>=1.6.0 IMPORTED_TARGET)
 endif()
 
 if(NOT TARGET OpenMC::libopenmc)