Skip to content

Commit

Permalink
yocto_recipe.py: Use sensible default for <build_type> when not ROS 1 (
Browse files Browse the repository at this point in the history
…#267)

* It only makes sense for the default value for <build_type> to be
  "catkin" for ROS 1 distros. For others, use "ament_cmake".

Signed-off-by: Martin Jansa <[email protected]>
  • Loading branch information
shr-project authored Feb 21, 2020
1 parent 8fa83b3 commit b81af34
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion superflore/generators/bitbake/yocto_recipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ def __init__(
self.description = ''
self.license = None
self.homepage = None
self.build_type = 'catkin'
self.build_type = 'catkin' if \
yoctoRecipe._get_ros_version(distro) == 1 else 'ament_cmake'
self.maintainer = "OSRF"
self.depends = set()
self.depends_external = set()
Expand Down

0 comments on commit b81af34

Please sign in to comment.