latest pushes

humanoid_nav_msgs/CMakeLists.txt

@@ -4,26 +4,40 @@ project(humanoid_nav_msgs)
 #List to make rest of code more readable
 set(MESSAGE_DEPENDENCIES std_msgs geometry_msgs actionlib_msgs)
 
-#Declare build dependencies
-find_package(
-  catkin REQUIRED
-  COMPONENTS
-  message_generation
-  ${MESSAGE_DEPENDENCIES}
-)
 
-#Add message files
-add_message_files(DIRECTORY msg FILES StepTarget.msg)
+if($ENV{ROS_VERSION} EQUAL 1)
+  find_package(
+    catkin REQUIRED
+    COMPONENTS
+    message_generation
+    ${MESSAGE_DEPENDENCIES}
+  )
+else()
+  find_package(ament_cmake REQUIRED)
+endif()
+
+
+if($ENV{ROS_VERSION} EQUAL 1)
+  add_service_files(
+    DIRECTORY srv
+    FILES
+    ClipFootstep.srv
+    PlanFootsteps.srv
+    PlanFootstepsBetweenFeet.srv
+    StepTargetService.srv
+  )
+else()
+  ament_package()
+endif()
+
+
+add_message_files(
+  DIRECTORY 
+  msg 
+  FILES 
+  StepTarget.msg
+  )
 
-#Add service files
-add_service_files(
-  DIRECTORY srv
-  FILES
-  ClipFootstep.srv
-  PlanFootsteps.srv
-  PlanFootstepsBetweenFeet.srv
-  StepTargetService.srv
-)
 
 #Add action files
 add_action_files(