From 32be3e17cf298701d0d5dcfa13b4e1ab9468e1d8 Mon Sep 17 00:00:00 2001
From: "Garth N. Wells" <gnw20@cam.ac.uk>
Date: Sun, 24 Jan 2021 15:35:54 +0000
Subject: [PATCH 1/2] Change install location for some CMake file

---
 cpp/CMakeLists.txt                         | 2 +-
 cpp/cmake/templates/DOLFINXConfig.cmake.in | 2 +-
 cpp/dolfinx/CMakeLists.txt                 | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

Index: dolfinx/cpp/CMakeLists.txt
===================================================================
--- dolfinx.orig/cpp/CMakeLists.txt	2021-01-31 13:21:41.638267182 +0100
+++ dolfinx/cpp/CMakeLists.txt	2021-01-31 13:21:41.630267177 +0100
@@ -231,7 +231,7 @@
 configure_file(${DOLFINX_SOURCE_DIR}/cmake/templates/dolfinx.conf.in
                ${CMAKE_BINARY_DIR}/dolfinx.conf @ONLY)
 install(FILES ${CMAKE_BINARY_DIR}/dolfinx.conf
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dolfinx
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/dolfinx
         COMPONENT Development)
 
 #------------------------------------------------------------------------------
Index: dolfinx/cpp/cmake/templates/DOLFINXConfig.cmake.in
===================================================================
--- dolfinx.orig/cpp/cmake/templates/DOLFINXConfig.cmake.in	2021-01-31 13:21:41.638267182 +0100
+++ dolfinx/cpp/cmake/templates/DOLFINXConfig.cmake.in	2021-01-31 13:21:41.634267179 +0100
@@ -23,7 +23,7 @@
 
 if (NOT TARGET PETSC::petsc)
   set(DOLFINX_SKIP_BUILD_TESTS TRUE)
-  list(APPEND CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/dolfinx/cmake")
+  list(APPEND CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/dolfinx")
   find_dependency(PETSc REQUIRED QUIET)
 endif()
 
Index: dolfinx/cpp/dolfinx/CMakeLists.txt
===================================================================
--- dolfinx.orig/cpp/dolfinx/CMakeLists.txt	2021-01-31 13:21:41.638267182 +0100
+++ dolfinx/cpp/dolfinx/CMakeLists.txt	2021-01-31 13:21:41.634267179 +0100
@@ -148,7 +148,7 @@
   )
 
 # Generate DOLFINTargets.cmake
-install(EXPORT DOLFINXTargets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dolfinx/cmake)
+install(EXPORT DOLFINXTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dolfinx)
 
 # Install the header files
 foreach(DIR ${DOLFINX_DIRS})
@@ -166,7 +166,7 @@
 
 configure_package_config_file(${DOLFINX_SOURCE_DIR}/cmake/templates/DOLFINXConfig.cmake.in
 ${CMAKE_BINARY_DIR}/dolfinx/DOLFINXConfig.cmake
-INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dolfinx/cmake)
+INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dolfinx)
 
 # Install CMake helper files
 install(
@@ -175,7 +175,7 @@
   ${CMAKE_SOURCE_DIR}/cmake/modules/FindSLEPc.cmake
   ${CMAKE_BINARY_DIR}/dolfinx/DOLFINXConfig.cmake
   ${CMAKE_BINARY_DIR}/dolfinx/DOLFINXConfigVersion.cmake
-  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dolfinx/cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/dolfinx
   COMPONENT Development)
 
 #------------------------------------------------------------------------------