blob: 93114dadd6c6371c4216ff2a582b2488e134d7c9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
From c9e60ed064aa2938f71f2cacf79f0bb337812bf8 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@ozlabs.org>
Date: Tue, 17 Aug 2021 09:32:43 +1000
Subject: [PATCH] Use GNUInstallDirs instead of hard wiring install directories
On a multilib setup cmake files should go into lib64.
Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/710]
---
CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b97c1f59..ad574290 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,14 +70,15 @@ endif()
option(CEREAL_INSTALL "Generate the install target" ${CEREAL_MASTER_PROJECT})
if(CEREAL_INSTALL)
+ include(GNUInstallDirs)
include(CMakePackageConfigHelpers)
install(TARGETS cereal EXPORT ${PROJECT_NAME}Targets)
- install(DIRECTORY include/cereal DESTINATION include)
+ install(DIRECTORY include/cereal DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
set(configFile ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake)
set(versionFile ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake)
- set(configInstallDestination lib/cmake/${PROJECT_NAME})
+ set(configInstallDestination ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
configure_package_config_file(
${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
--
2.31.1
|
