Minor CMakeLists cleanup

Signed-off-by: Dan Rose <dan@digilabs.io>
This commit is contained in:
Dan Rose 2019-11-18 02:56:47 -06:00 committed by eboasson
parent 4089feee81
commit 0686850890

View file

@ -16,8 +16,6 @@ cmake_minimum_required(VERSION 3.5)
project(rmw_cyclonedds_cpp) project(rmw_cyclonedds_cpp)
link_directories(/usr/local/lib)
# Default to C++14 # Default to C++14
if(NOT CMAKE_CXX_STANDARD) if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
@ -50,10 +48,6 @@ ament_export_dependencies(rosidl_generator_c)
ament_export_dependencies(rosidl_typesupport_introspection_c) ament_export_dependencies(rosidl_typesupport_introspection_c)
ament_export_dependencies(rosidl_typesupport_introspection_cpp) ament_export_dependencies(rosidl_typesupport_introspection_cpp)
include_directories(include)
###??
add_library(rmw_cyclonedds_cpp add_library(rmw_cyclonedds_cpp
src/namespace_prefix.cpp src/namespace_prefix.cpp
src/rmw_node.cpp src/rmw_node.cpp
@ -65,6 +59,11 @@ add_library(rmw_cyclonedds_cpp
src/deserialization_exception.cpp src/deserialization_exception.cpp
) )
target_include_directories(rmw_cyclonedds_cpp PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(rmw_cyclonedds_cpp CycloneDDS::ddsc) target_link_libraries(rmw_cyclonedds_cpp CycloneDDS::ddsc)
ament_target_dependencies(rmw_cyclonedds_cpp ament_target_dependencies(rmw_cyclonedds_cpp