From 061fc82e4374f0d810acf017236216e77eced683 Mon Sep 17 00:00:00 2001
From: Andrew Davis <andrew.davis@ukaea.uk>
Date: Wed, 12 Feb 2020 12:30:19 +0000
Subject: [PATCH 1/3] These fixes allow the Cmake find_package infrastructure
 to work correctly

---
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec6b500b4..3cbd27b4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,7 +207,6 @@ endif()
 add_library(faddeeva STATIC vendor/faddeeva/Faddeeva.cc)
 target_include_directories(faddeeva
   PUBLIC
-    $<INSTALL_INTERFACE:include/faddeeva>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/vendor/faddeeva>
 )
 target_compile_options(faddeeva PRIVATE ${cxxflags})
@@ -389,7 +388,7 @@ add_custom_command(TARGET libopenmc POST_BUILD
 #===============================================================================
 
 set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/OpenMC)
-install(TARGETS openmc libopenmc faddeeva
+install(TARGETS openmc libopenmc faddeeva pugixml gsl-lite
   EXPORT openmc-targets
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

From aa9acca56ad1d8e43d6774afda37a6d4b8d70a32 Mon Sep 17 00:00:00 2001
From: Andrew Davis <andrew.davis@ukaea.uk>
Date: Wed, 12 Feb 2020 22:10:41 +0000
Subject: [PATCH 2/3] Revert "These fixes allow the Cmake find_package
 infrastructure to work correctly"

This reverts commit cfee500608a823cdbed751ed4cd7675cef519561.
---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cbd27b4e..ec6b500b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,6 +207,7 @@ endif()
 add_library(faddeeva STATIC vendor/faddeeva/Faddeeva.cc)
 target_include_directories(faddeeva
   PUBLIC
+    $<INSTALL_INTERFACE:include/faddeeva>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/vendor/faddeeva>
 )
 target_compile_options(faddeeva PRIVATE ${cxxflags})
@@ -388,7 +389,7 @@ add_custom_command(TARGET libopenmc POST_BUILD
 #===============================================================================
 
 set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/OpenMC)
-install(TARGETS openmc libopenmc faddeeva pugixml gsl-lite
+install(TARGETS openmc libopenmc faddeeva
   EXPORT openmc-targets
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

From b9c3d7af5424d241be522bcf8f791c9e1dfa4ce3 Mon Sep 17 00:00:00 2001
From: Andrew Davis <andrew.davis@ukaea.uk>
Date: Wed, 12 Feb 2020 22:11:58 +0000
Subject: [PATCH 3/3] Fix CMake issues per Paul R fixes

---
 cmake/OpenMCConfig.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmake/OpenMCConfig.cmake b/cmake/OpenMCConfig.cmake
index 0bc86fa71..29a0e4542 100644
--- a/cmake/OpenMCConfig.cmake
+++ b/cmake/OpenMCConfig.cmake
@@ -1,5 +1,8 @@
 get_filename_component(OpenMC_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY)
 
+find_package(fmt REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../fmt)
+find_package(gsl-lite REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../gsl-lite)
+find_package(pugixml REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../pugixml)
 find_package(xtl REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../xtl)
 find_package(xtensor REQUIRED HINTS ${OpenMC_CMAKE_DIR}/../xtensor)