Skip to content

Commit

Permalink
Merge branch internal changes into external
Browse files Browse the repository at this point in the history
  • Loading branch information
brakmic-aleksandar authored and brakmic-aleksandar-conti committed Oct 14, 2020
2 parents 95b44f7 + 5cf487a commit f2f2c49
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ eCAL RMW can offer:

### Linux

* Install [eCAL](https://github.conti.de/CTZS/ecal)
* Install [eCAL](https://github.com/continental/ecal)
* Clone latest release of this repository into your [ROS2 workspace](https://index.ros.org/doc/ros2/Tutorials/Workspace/Creating-A-Workspace/)
* Source ROS2 `source /path/to/your/ros/distro/folder/setup.bash`
* Run `colcon build` from your workspace folder
Expand All @@ -21,7 +21,7 @@ eCAL RMW can offer:

### Windows

* Install [eCAL](https://github.conti.de/CTZS/ecal)
* Install [eCAL](https://github.com/continental/ecal)
* Clone latest release of this repository into your [ROS2 workspace](https://index.ros.org/doc/ros2/Tutorials/Workspace/Creating-A-Workspace/)
* Source ROS2 `call C:/path/to/your/ros/distro/folder/setup.bat`
* Run `colcon build` from your workspace folder
Expand Down Expand Up @@ -51,4 +51,4 @@ RMW can currently work with only one serialization method at the time.
### Currently supported ROS2 distributions

* Dashing Diademata
* Eloquent Elusor
* Eloquent Elusor
4 changes: 2 additions & 2 deletions rmw_ecal_dynamic_cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
# ========================= RMW eCAL LICENSE =================================

cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.12)

project(rmw_ecal_dynamic_cpp)

Expand Down Expand Up @@ -117,4 +117,4 @@ register_rmw_implementation(
"cpp:rosidl_typesupport_cpp:rosidl_typesupport_introspection_cpp"
)

ament_package()
ament_package()

0 comments on commit f2f2c49

Please sign in to comment.