Merge branch 'toolchain-2.9' into cmake-disable-orogen

Author: meyerj

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: gitsubmodule
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "10:00"
+  open-pull-requests-limit: 10

.travis.yml

@@ -63,8 +63,15 @@ before_install:
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       brew update
       brew reinstall boost cmake ccache gnu-getopt readline omniorb
-      brew link --force gnu-getopt
-      brew link --force readline
+
+      # gnu-getopt is keg-only and newer HomeBrew versions refuse to link it.
+      #brew link --force gnu-getopt
+      export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
+
+      # readline is keg-only and newer HomeBrew versions refuse to link it.
+      #brew link --force readline
+      export CMAKE_PREFIX_PATH="/usr/local/opt/readline"
+
       export PATH="/use/local/opt/ccache/libexec:$PATH"
     fi
 

ocl

@@ -6,15 +6,15 @@
   <description>
     This metapackage provides Orocos RTT and OCL and dependencies.
   </description>
-  <license>GPL v2 + linking exception<license>
-  <licence>LGPL-2.1</license>
+  <license>GPL v2 + linking exception</license>
+  <license>LGPL-2.1</license>
   <maintainer email="[email protected]">Orocos Developers</maintainer>
 
-  <buildtool_depend>catkin</buildtool_depend> <!-- optional -->
+  <buildtool_depend condition="$ROS_VERSION == 1">catkin</buildtool_depend> <!-- optional -->
 
-  <depend>log4cpp</depend>
-  <depend>ocl</depend>
-  <depend>rtt</depend>
+  <exec_depend>log4cpp</exec_depend>
+  <exec_depend>ocl</exec_depend>
+  <exec_depend>rtt</exec_depend>
 
   <export>
     <metapackage/>