35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 8466b9eacef37950f46488bc0284996b72aee2fe Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
|
|
Date: Sat, 18 May 2024 00:23:57 +0200
|
|
Subject: [PATCH] Fix installation of objects into lib64
|
|
|
|
---
|
|
cmake/modules/DuneProject.cmake | 10 +---------
|
|
1 file changed, 1 insertion(+), 9 deletions(-)
|
|
|
|
diff --git a/cmake/modules/DuneProject.cmake b/cmake/modules/DuneProject.cmake
|
|
index b8ae398c5..3bdaac6b2 100644
|
|
--- a/cmake/modules/DuneProject.cmake
|
|
+++ b/cmake/modules/DuneProject.cmake
|
|
@@ -216,16 +216,8 @@ endif()")
|
|
endif()
|
|
get_property(${ProjectName}_LIBRARIES GLOBAL PROPERTY ${ProjectName}_LIBRARIES)
|
|
|
|
- # compute under which libdir the package configuration files are to be installed.
|
|
- # If the module installs an object library we use CMAKE_INSTALL_LIBDIR
|
|
- # to capture the multiarch triplet of Debian/Ubuntu.
|
|
- # Otherwise we fall back to DUNE_INSTALL_NONOBJECTLIB which is lib
|
|
- # if not set otherwise.
|
|
- get_property(${ProjectName}_LIBRARIES GLOBAL PROPERTY ${ProjectName}_LIBRARIES)
|
|
- if(${ProjectName}_LIBRARIES)
|
|
+ if(NOT DEFINED DUNE_INSTALL_LIBDIR)
|
|
set(DUNE_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
|
|
- else()
|
|
- set(DUNE_INSTALL_LIBDIR ${DUNE_INSTALL_NONOBJECTLIBDIR})
|
|
endif()
|
|
|
|
# Set the location of the doc file source. Needed by custom package configuration
|
|
--
|
|
2.45.1
|
|
|