Merge pull request #34 from RonaldsonBellande/main

latest pushes

CMakeLists.txt

@@ -1,13 +1,27 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(mobile_catkin_gradle_plugins)
 
-find_package(catkin REQUIRED COMPONENTS rosmobile_build_tools)
+# Find ROS
+if($ENV{ROS_VERSION} EQUAL 1)
+find_package(
+  catkin REQUIRED COMPONENTS 
+  mobile_catkin_modules_build_development_tools
+  )
+else()
+  find_package(ament_cmake REQUIRED)
+endif()
+
 
 catkin_rosmobile_setup(publish installDist)
 
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /opt/ros/main)
 
-catkin_package(CATKIN_DEPENDS rosmobile_build_tools)
+if($ENV{ROS_VERSION} EQUAL 1)
+  catkin_package(
+    CATKIN_DEPENDS 
+    mobile_catkin_modules_build_development_tools
+    )
+endif()
 
 install(
   DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}/com/github/mobile_catkin_gradle_plugins/

README.md

@@ -1,4 +1,4 @@
-## ROS Mobile Catkin Gradle Plugins 
+## ROS/ROS2 Mobile Catkin Gradle Plugins 
 
 ### Website
 ---------------------------------------------------------------------------------------

package.xml

@@ -1,19 +1,30 @@
 <?xml version="1.0"?>
-<package format="2">
+<package format="3">
   <name>mobile_catkin_gradle_plugins</name>
   <version>0.4.1</version>
-  <description>Bootstrap utilities for rosmobile builds</description>
-
+  <description>Bootstrap utilities for mobile catkin modules build development tools</description>
   <author>Ronaldson Bellande</author>
-  <maintainer email="ronaldsonbellande@gmail.com">Ronaldson Bellande</maintainer>
   <license>Apache 2.0</license>
 
-  <buildtool_depend>catkin</buildtool_depend>
+  <maintainer email="ronaldsonbellande@gmail.com">Ronaldson Bellande</maintainer>
+
+
+  <buildtool_depend condition="$ROS_VERSION == 1">catkin</buildtool_depend>
+
+  <build_depend condition="$ROS_VERSION == 1">mobile_catkin_modules_build_development_tools</build_depend>
+
+  <build_export_depend condition="$ROS_VERSION == 1">mobile_catkin_modules_build_development_tools</build_export_depend>
+
+  <exec_depend condition="$ROS_VERSION == 1">mobile_catkin_modules_build_development_tools</exec_depend>
+
+
+  <buildtool_depend condition="$ROS_VERSION == 2">ament_cmake</buildtool_depend>
+
+  <build_depend condition="$ROS_VERSION == 2">mobile_catkin_modules_build_development_tools</build_depend>
 
-  <build_depend>rosmobile_build_tools</build_depend>
+  <build_export_depend condition="$ROS_VERSION == 2">mobile_catkin_modules_build_development_tools</build_export_depend>
 
-  <build_export_depend>rosmobile_build_tools</build_export_depend>
+  <exec_depend condition="$ROS_VERSION == 2">mobile_catkin_modules_build_development_tools</exec_depend>
 
-  <exec_depend>rosmobile_build_tools</exec_depend>
 
 </package>