niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change export order for static linking (#216)

Browse source
This commit is contained in:
Dirk Thomas 2018-03-22 16:26:33 -07:00 • committed by GitHub
parent 5fa1b0e0d9
commit bad0f55416
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rcl/CMakeLists.txt
View file

@ -47,11 +47,12 @@ set(${PROJECT_NAME}_sources
) )
add_library(${PROJECT_NAME} ${${PROJECT_NAME}_sources}) add_library(${PROJECT_NAME} ${${PROJECT_NAME}_sources})
# specific order: dependents before dependencies
ament_target_dependencies(${PROJECT_NAME} ament_target_dependencies(${PROJECT_NAME}
"rcl_interfaces" "rcl_interfaces"
"rcutils"
"rmw"
"rmw_implementation" "rmw_implementation"
"rmw"
"rcutils"
"rosidl_generator_c" "rosidl_generator_c"
) )
@ -71,17 +72,17 @@ install(
# This is overwritten each loop, but which one it points to doesn't really matter. # This is overwritten each loop, but which one it points to doesn't really matter.
set(rcl_lib_dir "$<TARGET_FILE_DIR:${PROJECT_NAME}>") set(rcl_lib_dir "$<TARGET_FILE_DIR:${PROJECT_NAME}>")
# specific order: dependents before dependencies
ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME})
ament_export_dependencies(ament_cmake) ament_export_dependencies(ament_cmake)
ament_export_dependencies(rcl_interfaces) ament_export_dependencies(rcl_interfaces)
ament_export_dependencies(rcutils)
ament_export_dependencies(rmw)
ament_export_dependencies(rmw_implementation) ament_export_dependencies(rmw_implementation)
ament_export_dependencies(rmw)
ament_export_dependencies(rcutils)
ament_export_dependencies(rosidl_generator_c) ament_export_dependencies(rosidl_generator_c)
ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME})
if(BUILD_TESTING) if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED) find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies() ament_lint_auto_find_test_dependencies()

10
rcl_lifecycle/CMakeLists.txt
View file

@ -40,9 +40,10 @@ add_library(
rcl_lifecycle rcl_lifecycle
${rcl_lifecycle_sources}) ${rcl_lifecycle_sources})
# specific order: dependents before dependencies
ament_target_dependencies(rcl_lifecycle ament_target_dependencies(rcl_lifecycle
"lifecycle_msgs"
"rcl" "rcl"
"lifecycle_msgs"
"rcutils" "rcutils"
) )
@ -94,10 +95,13 @@ if(BUILD_TESTING)
endif() endif()
endif() endif()
ament_export_dependencies(ament_cmake) # specific order: dependents before dependencies
ament_export_dependencies(lifecycle_msgs)
ament_export_include_directories(include) ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME}) ament_export_libraries(${PROJECT_NAME})
ament_export_dependencies(ament_cmake)
ament_export_dependencies(rcl)
ament_export_dependencies(lifecycle_msgs)
ament_export_dependencies(rcutils)
ament_package() ament_package()
install( install(