Fix Afma6 data path detection

fspindle · May 13, 2024 · 622297f · 622297f
1 parent f1df5cb
commit 622297f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1743,9 +1743,18 @@ status("")
 status("  Real robots: ")
 status("    Use Afma4:"              USE_AFMA4        THEN "yes" ELSE "no")
 status("    Use Afma6:"              USE_AFMA6        THEN "yes" ELSE "no")
+if(USE_AFMA6)
+status("    \\- Data:"               AFMA6_DATA_FOUND THEN "yes (in ${AFMA6_DATA_PATH})" ELSE "no")
+endif()
 status("    Use Franka:"             USE_FRANKA       THEN "yes (ver ${Franka_VERSION})" ELSE "no")
 status("    Use Viper650:"           USE_VIPER650     THEN "yes" ELSE "no")
+if(USE_VIPER650)
+status("    \\- Data:"               VIPER650_DATA_FOUND THEN "yes (in ${VIPER650_DATA_PATH})" ELSE "no")
+endif()
 status("    Use Viper850:"           USE_VIPER850     THEN "yes" ELSE "no")
+if(USE_VIPER850)
+status("    \\- Data:"               VIPER850_DATA_FOUND THEN "yes (in ${VIPER850_DATA_PATH})" ELSE "no")
+endif()
 status("    Use ur_rtde:"            USE_UR_RTDE      THEN "yes (ver ${ur_rtde_VERSION})" ELSE "no")
 status("    Use Kinova Jaco:"        USE_JACOSDK      THEN "yes" ELSE "no")
 status("    Use aria (Pioneer):"     USE_ARIA         THEN "yes" ELSE "no")

diff --git a/cmake/FindAfma6_data.cmake b/cmake/FindAfma6_data.cmake
@@ -45,6 +45,10 @@ find_path(AFMA6_DATA_PATH
     /home/soft/Afma6/current
     /udd/fspindle/robot/Afma6/current
     Z:/robot/Afma6/current
+    /home/soft/afma6/afma6
+    /home/soft/afma6/current
+    /udd/fspindle/robot/afma6/current
+    Z:/robot/afma6/current
   )
 
 #message("DBG AFMA6_DATA_PATH=${AFMA6_DATA_PATH}")
@@ -58,4 +62,3 @@ endif()
 mark_as_advanced(
   AFMA6_DATA_PATH
 )
-
diff --git a/cmake/FindViper650_data.cmake b/cmake/FindViper650_data.cmake
@@ -59,4 +59,3 @@ endif()
 mark_as_advanced(
   VIPER650_DATA_PATH
 )
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,4 +59,3 @@ endif()
		mark_as_advanced(
		VIPER650_DATA_PATH
		)