Merge pull request #29 from ThomasDuvinage/master

add catkin_devel_prefix condition on RosWalkState and TeleopState build
isri-aist · Aug 2, 2024 · c6a2768 · c6a2768
2 parents 1941b66 + 4f6f61b
commit c6a2768
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -104,14 +104,15 @@ jobs:
             mpc-method: PreviewControlZmp
             mpc-framework: OpenLoopMpc
             motion-type: WalkingOnPlaneVel # WalkingOnPlane
-          - os: ubuntu-20.04
-            catkin-build: standalone # catkin
-            build-type: RelWithDebInfo
-            mc-rtc-version: head
-            compiler: gcc
-            mpc-method: PreviewControlZmp
-            mpc-framework: OpenLoopMpc
-            motion-type: WalkingOnPlaneRos # WalkingOnPlane
+          # Skip ROS-based states because standalone build does not assume the existence of ROS.
+          # - os: ubuntu-20.04
+          #   catkin-build: standalone # catkin
+          #   build-type: RelWithDebInfo
+          #   mc-rtc-version: head
+          #   compiler: gcc
+          #   mpc-method: PreviewControlZmp
+          #   mpc-framework: OpenLoopMpc
+          #   motion-type: WalkingOnPlaneRos # WalkingOnPlane
           - os: ubuntu-20.04
             catkin-build: standalone # catkin
             build-type: RelWithDebInfo

diff --git a/src/states/CMakeLists.txt b/src/states/CMakeLists.txt
@@ -10,13 +10,15 @@ add_fsm_state(GuiWalkState GuiWalkState.cpp)
 target_link_libraries(GuiWalkState PUBLIC
   ${CONTROLLER_NAME})
 
-add_fsm_state(RosWalkState RosWalkState.cpp)
-target_link_libraries(RosWalkState PUBLIC
-  ${CONTROLLER_NAME})
+if(DEFINED CATKIN_DEVEL_PREFIX)
+  add_fsm_state(RosWalkState RosWalkState.cpp)
+  target_link_libraries(RosWalkState PUBLIC
+    ${CONTROLLER_NAME})
 
-add_fsm_state(TeleopState TeleopState.cpp)
-target_link_libraries(TeleopState PUBLIC
-  ${CONTROLLER_NAME})
+  add_fsm_state(TeleopState TeleopState.cpp)
+  target_link_libraries(TeleopState PUBLIC
+    ${CONTROLLER_NAME})
+endif()
 
 find_package(baseline_footstep_planner QUIET)
 if(${baseline_footstep_planner_FOUND})