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
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Thu, 7 Oct 2021 14:15:29 +0200
Subject: Use GNUInstallDirs for paths
---
orocos_kdl/CMakeLists.txt | 10 ++++++----
orocos_kdl/orocos_kdl-config.cmake.in | 10 +---------
orocos_kdl/orocos_kdl.pc.in | 8 ++------
orocos_kdl/src/CMakeLists.txt | 6 +++---
4 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/orocos_kdl/CMakeLists.txt b/orocos_kdl/CMakeLists.txt
index 870790e..77da1be 100644
--- a/orocos_kdl/CMakeLists.txt
+++ b/orocos_kdl/CMakeLists.txt
@@ -53,6 +53,8 @@ find_package(Eigen3 QUIET)
include_directories(${EIGEN3_INCLUDE_DIR})
SET(KDL_CFLAGS "${KDL_CFLAGS} -I\"${EIGEN3_INCLUDE_DIR}\"")
+include(GNUInstallDirs)
+
# Check the platform STL containers capabilities
include(cmake/CheckSTLContainers.cmake)
CHECK_STL_CONTAINERS()
@@ -115,12 +117,12 @@ CONFIGURE_FILE(orocos_kdl-config.cmake.in
CONFIGURE_FILE(orocos_kdl-config-version.cmake.in
${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake @ONLY)
-INSTALL(FILES ${PROJECT_BINARY_DIR}/orocos_kdl-config.cmake DESTINATION share/orocos_kdl/cmake)
-INSTALL(FILES ${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake DESTINATION share/orocos_kdl/cmake)
+INSTALL(FILES ${PROJECT_BINARY_DIR}/orocos_kdl-config.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/orocos_kdl")
+INSTALL(FILES ${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/orocos_kdl")
# Generate pkg-config package configuration
CONFIGURE_FILE(orocos_kdl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/orocos-kdl.pc @ONLY)
CONFIGURE_FILE(orocos_kdl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/orocos_kdl.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/orocos-kdl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/orocos_kdl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/orocos-kdl.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/orocos_kdl.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
diff --git a/orocos_kdl/orocos_kdl-config.cmake.in b/orocos_kdl/orocos_kdl-config.cmake.in
index 4af3dd3..c6bfe35 100644
--- a/orocos_kdl/orocos_kdl-config.cmake.in
+++ b/orocos_kdl/orocos_kdl-config.cmake.in
@@ -4,9 +4,6 @@
# orocos_kdl_LIBRARIES - libraries to link against for Orocos KDL
# orocos_kdl_PKGCONFIG_DIR - directory containing the .pc pkgconfig files
-# Compute paths
-get_filename_component(orocos_kdl_PREFIX "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
-
# Find dependencies
find_package(Eigen3 QUIET)
@@ -15,12 +12,7 @@ if(KDL_USE_NEW_TREE_INTERFACE)
find_package(Boost REQUIRED)
endif()
-if(NOT TARGET orocos-kdl)
- include("${CMAKE_CURRENT_LIST_DIR}/OrocosKDLTargets.cmake")
-endif()
-
set(orocos_kdl_INCLUDE_DIRS
- ${orocos_kdl_PREFIX}/include
${Boost_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIR}
)
@@ -28,4 +20,4 @@ set(orocos_kdl_LIBRARIES orocos-kdl)
set(orocos_kdl_TARGETS orocos-kdl)
# where the .pc pkgconfig files are installed
-set(orocos_kdl_PKGCONFIG_DIR "${orocos_kdl_PREFIX}/lib/pkgconfig")
+set(orocos_kdl_PKGCONFIG_DIR "@CMAKE_INSTALL_FULL_LIBDIR@/pkgconfig")
diff --git a/orocos_kdl/orocos_kdl.pc.in b/orocos_kdl/orocos_kdl.pc.in
index 8a477e8..69477ec 100644
--- a/orocos_kdl/orocos_kdl.pc.in
+++ b/orocos_kdl/orocos_kdl.pc.in
@@ -1,10 +1,6 @@
-prefix=${pcfiledir}/../..
-libdir=${prefix}/lib@LIB_SUFFIX@
-includedir=${prefix}/include
-
Name: orocos-kdl
Description: The Orocos Kinematics and Dynamics Library
Requires:
Version: @KDL_VERSION@
-Libs: -L${libdir} -lorocos-kdl
-Cflags: -I${includedir} @KDL_CFLAGS@
+Libs: -lorocos-kdl
+Cflags: @KDL_CFLAGS@
diff --git a/orocos_kdl/src/CMakeLists.txt b/orocos_kdl/src/CMakeLists.txt
index 954b8fc..428826f 100644
--- a/orocos_kdl/src/CMakeLists.txt
+++ b/orocos_kdl/src/CMakeLists.txt
@@ -65,7 +65,7 @@ SET_TARGET_PROPERTIES( orocos-kdl PROPERTIES
#### Settings for rpath disabled (back-compatibility)
IF(NOT OROCOSKDL_ENABLE_RPATH)
SET_TARGET_PROPERTIES( orocos-kdl PROPERTIES
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+ INSTALL_NAME_DIR "${CMAKE_INSTALL_LIBDIR}")
ENDIF()
#####end RPATH
@@ -76,8 +76,8 @@ TARGET_LINK_LIBRARIES(orocos-kdl ${Boost_LIBRARIES})
INSTALL(TARGETS orocos-kdl
EXPORT OrocosKDLTargets
- ARCHIVE DESTINATION lib${LIB_SUFFIX}
- LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION bin
PUBLIC_HEADER DESTINATION include/kdl
)
|
