From 8da8d8c5949052010d21f43626777a85d54067d4 Mon Sep 17 00:00:00 2001
From: Jean-Pierre Busch <jean-pierre.busch@ika.rwth-aachen.de>
Date: Fri, 24 Nov 2023 17:27:00 +0100
Subject: [PATCH] remove ROS metapackage tag

---
 etsi_its_coding/etsi_its_coding/CMakeLists.txt | 2 +-
 etsi_its_coding/etsi_its_coding/package.xml    | 1 -
 etsi_its_messages/CMakeLists.txt               | 2 +-
 etsi_its_messages/package.xml                  | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/etsi_its_coding/etsi_its_coding/CMakeLists.txt b/etsi_its_coding/etsi_its_coding/CMakeLists.txt
index dc459a22d..8e70f36d7 100644
--- a/etsi_its_coding/etsi_its_coding/CMakeLists.txt
+++ b/etsi_its_coding/etsi_its_coding/CMakeLists.txt
@@ -14,6 +14,6 @@ if(${ROS_VERSION} EQUAL 2)
 elseif(${ROS_VERSION} EQUAL 1)
 
   find_package(catkin REQUIRED)
-  catkin_metapackage()
+  catkin_package()
 
 endif()
diff --git a/etsi_its_coding/etsi_its_coding/package.xml b/etsi_its_coding/etsi_its_coding/package.xml
index c39fe1299..4527f9c9f 100644
--- a/etsi_its_coding/etsi_its_coding/package.xml
+++ b/etsi_its_coding/etsi_its_coding/package.xml
@@ -23,7 +23,6 @@
   <depend>etsi_its_denm_coding</depend>
 
   <export>
-    <metapackage condition="$ROS_VERSION == 1"/>
     <build_type condition="$ROS_VERSION == 2">ament_cmake</build_type>
   </export>
 
diff --git a/etsi_its_messages/CMakeLists.txt b/etsi_its_messages/CMakeLists.txt
index 950b215e1..a66330fef 100644
--- a/etsi_its_messages/CMakeLists.txt
+++ b/etsi_its_messages/CMakeLists.txt
@@ -14,6 +14,6 @@ if(${ROS_VERSION} EQUAL 2)
 elseif(${ROS_VERSION} EQUAL 1)
 
   find_package(catkin REQUIRED)
-  catkin_metapackage()
+  catkin_package()
 
 endif()
diff --git a/etsi_its_messages/package.xml b/etsi_its_messages/package.xml
index 57507325b..210a0c7aa 100644
--- a/etsi_its_messages/package.xml
+++ b/etsi_its_messages/package.xml
@@ -25,7 +25,6 @@
   <exec_depend>etsi_its_msgs</exec_depend>
 
   <export>
-    <metapackage condition="$ROS_VERSION == 1"/>
     <build_type condition="$ROS_VERSION == 2">ament_cmake</build_type>
   </export>