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

make cyclonedds vender package play nice with colcon (#34)

Browse source 
* Un-vendor cyclonedds

Upstream changes in https://github.com/eclipse-cyclonedds/cyclonedds/pull/256 should make this unnecessary and allow you to clone the package into your ROS workspace.

* Remove obsolete gitignore

* Recommend cloning eclipse-cyclonedds/cyclonedds
This commit is contained in:
Dan Rose 2019-09-18 12:49:39 -05:00 • committed by eboasson
parent e849c71122
commit b39efafd62
5 changed files with 4 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rmw_cyclonedds_cpp/CMakeLists.txt
View file

@ -16,8 +16,6 @@ cmake_minimum_required(VERSION 3.5)
project(rmw_cyclonedds_cpp)
set(CYCLONEDDS_FROM_SOURCE CACHE BOOL "Should we download and build cycloneDDS from source?")
link_directories(/usr/local/lib)
# Default to C++14
@ -33,13 +31,7 @@ find_package(ament_cmake_ros REQUIRED)
find_package(rcutils REQUIRED)
if(CYCLONEDDS_FROM_SOURCE)
message("Building CycloneDDS from source")
find_package(cyclonedds_vendor REQUIRED)
else()
find_package(cyclonedds_cmake_module REQUIRED)
message("Using installed CycloneDDS")
endif()
find_package(cyclonedds_cmake_module REQUIRED)
find_package(CycloneDDS REQUIRED CONFIG)
find_package(rmw REQUIRED)