| 1 |
Description: Install cmake config of header-only module in /usr/lib/cmake |
| 2 |
Needed to make it work in multiarch settings. |
| 3 |
Author: Markus Blatt |
| 4 |
--- |
| 5 |
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ |
| 6 |
--- a/cmake/modules/DuneAddLibrary.cmake |
| 7 |
+++ b/cmake/modules/DuneAddLibrary.cmake |
| 8 |
@@ -213,6 +213,8 @@ function(dune_add_library_normal _name) |
| 9 |
set(ARG_NAMESPACE Dune::) |
| 10 |
endif() |
| 11 |
|
| 12 |
+ set_property(GLOBAL PROPERTY ${PROJECT_NAME}_HAS_LIB ON) |
| 13 |
+ |
| 14 |
set(alias ${ARG_NAMESPACE}${ARG_EXPORT_NAME}) |
| 15 |
if(NOT TARGET ${alias}) |
| 16 |
add_library(${alias} ALIAS ${_name}) |
| 17 |
--- a/cmake/modules/DuneProject.cmake |
| 18 |
+++ b/cmake/modules/DuneProject.cmake |
| 19 |
@@ -425,7 +425,15 @@ endif()") |
| 20 |
if(DEFINED DUNE_INSTALL_LIBDIR) |
| 21 |
message(DEPRECATION "DUNE_INSTALL_LIBDIR is deprecated, use CMAKE_INSTALL_LIBDIR instead") |
| 22 |
else() |
| 23 |
- set(DUNE_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}) |
| 24 |
+ # Determine whether this module is header-only |
| 25 |
+ # In the case the property is not defined |
| 26 |
+ get_property(_has_lib GLOBAL PROPERTY ${PROJECT_NAME}_HAS_LIB SET) |
| 27 |
+ |
| 28 |
+ if(_has_lib) |
| 29 |
+ set(DUNE_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}) |
| 30 |
+ else() |
| 31 |
+ set(DUNE_INSTALL_LIBDIR ${DUNE_INSTALL_NONOBJECTLIBDIR}) |
| 32 |
+ endif() |
| 33 |
endif() |
| 34 |
|
| 35 |
# Set the location of the doc file source. Needed by custom package configuration |
| 36 |
@@ -538,7 +546,7 @@ get_filename_component(_dir \"\${CMAKE_C |
| 37 |
|
| 38 |
# install library export set |
| 39 |
install(EXPORT ${_export_set} |
| 40 |
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${ProjectName} |
| 41 |
+ DESTINATION ${DUNE_INSTALL_LIBDIR}/cmake/${ProjectName} |
| 42 |
NAMESPACE ${_namespace} |
| 43 |
FILE ${_target_file}) |
| 44 |
|