Skip to content

Commit 6e752ed

Browse files
committed
(kdl) use some newer cmake funcs
1 parent 247be55 commit 6e752ed

File tree

3 files changed

+33
-44
lines changed

3 files changed

+33
-44
lines changed

orocos_kdl/CMakeLists.txt

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,42 @@ export(TARGETS orocos-kdl
116116

117117
export(PACKAGE orocos_kdl)
118118

119+
include(CMakePackageConfigHelpers)
119120
# Generate CMake package configuration
120-
CONFIGURE_FILE(orocos_kdl-config.cmake.in
121-
${PROJECT_BINARY_DIR}/orocos_kdl-config.cmake @ONLY)
122-
CONFIGURE_FILE(orocos_kdl-config-version.cmake.in
123-
${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake @ONLY)
121+
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/orocos_kdl-config.cmake.in
122+
${PROJECT_BINARY_DIR}/orocos_kdl-config.cmake
123+
INSTALL_DESTINATION share/orocos_kdl/cmake
124+
)
125+
126+
write_basic_package_version_file(
127+
${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake
128+
VERSION ${KDL_VERSION}
129+
COMPATIBILITY SameMajorVersion
130+
)
131+
132+
install(
133+
FILES
134+
${PROJECT_BINARY_DIR}/orocos_kdl-config.cmake
135+
${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake
136+
DESTINATION share/orocos_kdl/cmake
137+
)
124138

125139
INSTALL(FILES cmake/FindEigen3.cmake DESTINATION share/orocos_kdl/cmake)
126-
INSTALL(FILES ${PROJECT_BINARY_DIR}/orocos_kdl-config.cmake DESTINATION share/orocos_kdl/cmake)
127-
INSTALL(FILES ${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake DESTINATION share/orocos_kdl/cmake)
128140
INSTALL(EXPORT OrocosKDLTargets DESTINATION share/orocos_kdl/cmake)
129141

130142
# Generate pkg-config package configuration
131-
CONFIGURE_FILE(orocos_kdl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/orocos-kdl.pc @ONLY)
132-
CONFIGURE_FILE(orocos_kdl.pc.in ${CMAKE_CURRENT_BINARY_DIR}/orocos_kdl.pc @ONLY)
133-
134-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/orocos-kdl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
135-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/orocos_kdl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
143+
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/orocos_kdl.pc.in
144+
${PROJECT_BINARY_DIR}/orocos_kdl.pc
145+
INSTALL_DESTINATION lib${LIB_SUFFIX}/pkgconfig
146+
)
147+
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/orocos_kdl.pc.in
148+
${PROJECT_BINARY_DIR}/orocos-kdl.pc
149+
INSTALL_DESTINATION lib${LIB_SUFFIX}/pkgconfig
150+
)
151+
152+
install(
153+
FILES
154+
${PROJECT_BINARY_DIR}/orocos_kdl.pc
155+
${PROJECT_BINARY_DIR}/orocos-kdl.pc
156+
DESTINATION lib${LIB_SUFFIX}/pkgconfig
157+
)

orocos_kdl/cmake_uninstall.cmake.in

Lines changed: 0 additions & 22 deletions
This file was deleted.

orocos_kdl/orocos_kdl-config-version.cmake.in

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)