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

Merge pull request #115 from esteve/honor-build-shared-libs-2

Browse source 
Control shared/static linking via BUILD_SHARED_LIBS and ament_cmake_ros
This commit is contained in:
Dirk Thomas 2017-04-10 08:16:57 -07:00 • committed by GitHub
commit 9f1459733a
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rcl/CMakeLists.txt
View file

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5)
project(rcl) project(rcl)
find_package(ament_cmake REQUIRED) find_package(ament_cmake_ros REQUIRED)
find_package(rcl_interfaces REQUIRED) find_package(rcl_interfaces REQUIRED)
find_package(rmw REQUIRED) find_package(rmw REQUIRED)
find_package(rmw_implementation REQUIRED) find_package(rmw_implementation REQUIRED)
@ -32,7 +32,7 @@ set(${PROJECT_NAME}_sources
src/rcl/wait.c src/rcl/wait.c
) )
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_sources}) add_library(${PROJECT_NAME} ${${PROJECT_NAME}_sources})
ament_target_dependencies(${PROJECT_NAME} ament_target_dependencies(${PROJECT_NAME}
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"

2
rcl/package.xml
View file

@ -9,7 +9,7 @@
<maintainer email="william@osrfoundation.org">William Woodall</maintainer> <maintainer email="william@osrfoundation.org">William Woodall</maintainer>
<license>Apache License 2.0</license> <license>Apache License 2.0</license>
<buildtool_depend>ament_cmake</buildtool_depend> <buildtool_depend>ament_cmake_ros</buildtool_depend>
<build_export_depend>rmw</build_export_depend> <build_export_depend>rmw</build_export_depend>