From 5c58ead939dbda458966be2dcf6fa7bd81ab6cb1 Mon Sep 17 00:00:00 2001 From: Esteve Fernandez Date: Tue, 13 Sep 2016 09:59:47 +0200 Subject: [PATCH] Control shared/static linking via BUILD_SHARED_LIBS and ament_cmake_ros --- rmw_fastrtps_cpp/CMakeLists.txt | 4 ++-- rmw_fastrtps_cpp/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rmw_fastrtps_cpp/CMakeLists.txt b/rmw_fastrtps_cpp/CMakeLists.txt index 4cec7422d..7811cc76c 100644 --- a/rmw_fastrtps_cpp/CMakeLists.txt +++ b/rmw_fastrtps_cpp/CMakeLists.txt @@ -20,7 +20,7 @@ if(NOT WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra -Wpedantic") endif() -find_package(ament_cmake REQUIRED) +find_package(ament_cmake_ros REQUIRED) find_package(fastrtps_cmake_module REQUIRED) find_package(fastcdr REQUIRED CONFIG) @@ -40,7 +40,7 @@ ament_export_dependencies(rosidl_typesupport_introspection_cpp) include_directories(include) -add_library(rmw_fastrtps_cpp SHARED +add_library(rmw_fastrtps_cpp src/functions.cpp ) target_link_libraries(rmw_fastrtps_cpp diff --git a/rmw_fastrtps_cpp/package.xml b/rmw_fastrtps_cpp/package.xml index 6b94a37fe..10bbdfdde 100644 --- a/rmw_fastrtps_cpp/package.xml +++ b/rmw_fastrtps_cpp/package.xml @@ -7,7 +7,7 @@ Ricardo González Apache License 2.0 - ament_cmake + ament_cmake_ros fastrtps_cmake_module ament_cmake