updated comments

usdot-fhwa-stol · Sep 19, 2024 · 0dda791 · 0dda791
1 parent 28d12f8
commit 0dda791
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 30 deletions.
diff --git a/carma_msgs/srv/Bind.srv b/carma_msgs/srv/Bind.srv
diff --git a/j2735_v2x_msgs/CMakeLists.txt b/j2735_v2x_msgs/CMakeLists.txt
@@ -25,15 +25,16 @@ find_package(ros_environment REQUIRED)
 
 set(ROS_VERSION $ENV{ROS_VERSION})
 
+file(GLOB msg_files msg/*.msg)
+set(msgs )
+
 if(${ROS_VERSION} EQUAL 1) # ROS 1
   find_package(catkin REQUIRED
     COMPONENTS
     message_generation
     std_msgs
   )
 
-  file(GLOB msg_files msg/*.msg)
-  set(msgs )
   foreach(filePath ${msg_files})
     get_filename_component(name ${filePath} NAME)
     set(msgs ${msgs} ${name})
@@ -60,11 +61,7 @@ if(${ROS_VERSION} EQUAL 1) # ROS 1
     ${catkin_INCLUDE_DIRS}
   )
 
-  install(DIRECTORY include/${PROJECT_NAME}/
-    DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-    FILES_MATCHING PATTERN "*.h"
-    PATTERN ".svn" EXCLUDE
-  )
+  set(INCLUDE_DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
 
 else() # ROS 2
 
@@ -73,8 +70,6 @@ else() # ROS 2
   find_package(ament_cmake_auto REQUIRED)
   find_package(std_msgs REQUIRED)
 
-  file(GLOB msg_files msg/*.msg)
-  set(msgs )
   foreach(filePath ${msg_files})
     get_filename_component(name ${filePath} NAME)
     set(msgs ${msgs} msg/${name})
@@ -91,6 +86,8 @@ else() # ROS 2
     DESTINATION include/${PROJECT_NAME}
   )
 
+  set(INCLUDE_DESTINATION include/${PROJECT_NAME})
+
   ament_export_dependencies(rosidl_default_runtime)
   ament_export_include_directories(include)
   ament_package()
@@ -113,3 +110,9 @@ else() # ROS 2
   endif()
 
 endif()
+
+install(DIRECTORY include/${PROJECT_NAME}/
+  DESTINATION ${INCLUDE_DESTINATION}
+  FILES_MATCHING PATTERN "*.h"
+  PATTERN ".svn" EXCLUDE
+)
diff --git a/j3224_v2x_msgs/CMakeLists.txt b/j3224_v2x_msgs/CMakeLists.txt
@@ -25,6 +25,9 @@ find_package(ros_environment REQUIRED)
 
 set(ROS_VERSION $ENV{ROS_VERSION})
 
+file(GLOB msg_files msg/*.msg)
+set(msgs )
+
 if(${ROS_VERSION} EQUAL 1) # ROS 1
 
   find_package(catkin REQUIRED 
@@ -34,8 +37,6 @@ if(${ROS_VERSION} EQUAL 1) # ROS 1
     j2735_v2x_msgs
   )
 
-  file(GLOB msg_files msg/*.msg)
-  set(msgs )
   foreach(filePath ${msg_files})
     get_filename_component(name ${filePath} NAME)
     set(msgs ${msgs} ${name})
@@ -63,11 +64,7 @@ if(${ROS_VERSION} EQUAL 1) # ROS 1
     ${catkin_INCLUDE_DIRS}
   )
 
-  install(DIRECTORY include/${PROJECT_NAME}/
-    DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-    FILES_MATCHING PATTERN "*.h"
-    PATTERN ".svn" EXCLUDE
-  )
+  set(INCLUDE_DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
 
 else() # ROS 2
 
@@ -79,8 +76,6 @@ else() # ROS 2
 
 
   # generate messages
-  file(GLOB msg_files msg/*.msg)
-  set(msgs )
   foreach(filePath ${msg_files})
     get_filename_component(name ${filePath} NAME)
     set(msgs ${msgs} msg/${name})
@@ -94,7 +89,15 @@ else() # ROS 2
           j2735_v2x_msgs
   )
 
+  set(INCLUDE_DESTINATION include/${PROJECT_NAME})
+
   ament_export_dependencies(rosidl_default_runtime)
   ament_package()
 
 endif()
+
+install(DIRECTORY include/${PROJECT_NAME}/
+  DESTINATION ${INCLUDE_DESTINATION}
+  FILES_MATCHING PATTERN "*.h"
+  PATTERN ".svn" EXCLUDE
+)