| 1 |
Index: dolfin/dolfin/CMakeLists.txt |
| 2 |
=================================================================== |
| 3 |
--- dolfin.orig/dolfin/CMakeLists.txt |
| 4 |
+++ dolfin/dolfin/CMakeLists.txt |
| 5 |
@@ -223,7 +223,7 @@ install(TARGETS dolfin EXPORT DOLFINTarg |
| 6 |
ARCHIVE DESTINATION ${DOLFIN_LIB_DIR} COMPONENT Development |
| 7 |
) |
| 8 |
|
| 9 |
-install(EXPORT DOLFINTargets DESTINATION ${DOLFIN_SHARE_DIR}/cmake) |
| 10 |
+install(EXPORT DOLFINTargets DESTINATION ${DOLFIN_CMAKE_INSTALL_DIR}) |
| 11 |
|
| 12 |
#------------------------------------------------------------------------------ |
| 13 |
# Generate CMake config files (DOLFINConfig{,Version}.cmake) |
| 14 |
@@ -242,7 +242,7 @@ install( |
| 15 |
${CMAKE_BINARY_DIR}/dolfin/DOLFINConfig.cmake |
| 16 |
${CMAKE_BINARY_DIR}/dolfin/DOLFINConfigVersion.cmake |
| 17 |
${CMAKE_BINARY_DIR}/dolfin/UseDOLFIN.cmake |
| 18 |
- DESTINATION ${DOLFIN_SHARE_DIR}/cmake |
| 19 |
+ DESTINATION ${DOLFIN_CMAKE_INSTALL_DIR} |
| 20 |
COMPONENT Development) |
| 21 |
|
| 22 |
#------------------------------------------------------------------------------ |
| 23 |
Index: dolfin/CMakeLists.txt |
| 24 |
=================================================================== |
| 25 |
--- dolfin.orig/CMakeLists.txt |
| 26 |
+++ dolfin/CMakeLists.txt |
| 27 |
@@ -511,6 +511,7 @@ include(GNUInstallDirs) |
| 28 |
|
| 29 |
# Set DOLFIN install sub-directories |
| 30 |
set(DOLFIN_BIN_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH "Binary installation directory.") |
| 31 |
+set(DOLFIN_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/dolfin" CACHE PATH "cmake dev file installation directory.") |
| 32 |
set(DOLFIN_LIB_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Library installation directory.") |
| 33 |
set(DOLFIN_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH "C/C++ header installation directory.") |
| 34 |
set(DOLFIN_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "pkg-config file installation directory.") |