Skip to content

Commit 55de511

Browse files
committed
build(fix): Properly export transitive dependencies
1 parent a1c01e7 commit 55de511

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

CMakeLists.txt

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,14 @@ if(NOT USE_ROS2)
4141
NAMESPACE ${PROJECT_NAME}::
4242
)
4343

44-
# Write initial config cmake file
45-
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/Config.cmake.in"
46-
"
47-
\@PACKAGE_INIT\@
48-
49-
include(\"\${CMAKE_CURRENT_LIST_DIR}/\@PROJECT_NAME\@Targets.cmake\")
50-
51-
set(\@PROJECT_NAME\@_LIBRARIES \@PROJECT_NAME\@::ForceColl)
52-
")
53-
5444
include(CMakePackageConfigHelpers)
55-
# generate the config file that is includes the exports
56-
configure_package_config_file(${CMAKE_CURRENT_BINARY_DIR}/Config.cmake.in
45+
configure_package_config_file(
46+
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake.in"
5747
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
58-
INSTALL_DESTINATION "lib/cmake/${PROJECT_NAME}"
48+
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
5949
NO_SET_AND_CHECK_MACRO
6050
NO_CHECK_REQUIRED_COMPONENTS_MACRO
61-
)
51+
)
6252

6353
# generate the version file for the config file
6454
# Extract version numbers from package.xml

cmake/Config.cmake.in

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@PACKAGE_INIT@
2+
3+
include(CMakeFindDependencyMacro)
4+
5+
find_dependency(Eigen3 REQUIRED)
6+
find_dependency(mc_rtc REQUIRED)
7+
find_dependency(qp_solver_collection REQUIRED)
8+
9+
include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
10+
11+
set(@PROJECT_NAME@_LIBRARIES @PROJECT_NAME@::ForceColl)

0 commit comments

Comments
 (0)