updated installation path of homePos

Gabriele · Gabriele · commit 55928fb5def6 · 2020-02-20T14:47:39.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,9 +14,6 @@ option(WBC_INSTALL_ALL_HOME_POS "Installation of all available home positions" O
 find_package(YARP REQUIRED)
 set(CMAKE_MODULE_PATH ${YARP_MODULE_PATH} ${CMAKE_MODULE_PATH})
 
-include(YarpInstallationHelpers)
-yarp_configure_external_installation(wbc)
-
 add_subdirectory(utilities)
 
 # ======================
diff --git a/utilities/homePositions/robots/bigman/CMakeLists.txt b/utilities/homePositions/robots/bigman/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname bigman)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/bigman_only_legs/CMakeLists.txt b/utilities/homePositions/robots/bigman_only_legs/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname bigman_only_legs)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubDarmstadt01/CMakeLists.txt b/utilities/homePositions/robots/iCubDarmstadt01/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubDarmstadt01)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubGazeboV2_5/CMakeLists.txt b/utilities/homePositions/robots/iCubGazeboV2_5/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubGazeboV2_5)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubGazeboV2_5_plus/CMakeLists.txt b/utilities/homePositions/robots/iCubGazeboV2_5_plus/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubGazeboV2_5_plus)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubGenova01/CMakeLists.txt b/utilities/homePositions/robots/iCubGenova01/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubGenova01)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubGenova02/CMakeLists.txt b/utilities/homePositions/robots/iCubGenova02/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubGenova02)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubGenova03/CMakeLists.txt b/utilities/homePositions/robots/iCubGenova03/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubGenova03)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubGenova04/CMakeLists.txt b/utilities/homePositions/robots/iCubGenova04/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubGenova04)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubGenova05/CMakeLists.txt b/utilities/homePositions/robots/iCubGenova05/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubGenova05)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubHeidelberg01/CMakeLists.txt b/utilities/homePositions/robots/iCubHeidelberg01/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubHeidelberg01)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubNancy01/CMakeLists.txt b/utilities/homePositions/robots/iCubNancy01/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubNancy01)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubParis01/CMakeLists.txt b/utilities/homePositions/robots/iCubParis01/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubParis01)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/iCubParis02/CMakeLists.txt b/utilities/homePositions/robots/iCubParis02/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname iCubParis02)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})
diff --git a/utilities/homePositions/robots/icubGazeboSim/CMakeLists.txt b/utilities/homePositions/robots/icubGazeboSim/CMakeLists.txt
@@ -2,4 +2,4 @@ set(robotname icubGazeboSim)
 
 file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
 
-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})
+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ set(robotname bigman)`
`2`	`2`
`3`	`3`	`file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)`
`4`	`4`
`5`		`-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})`
	`5`	`+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ set(robotname bigman_only_legs)`
`2`	`2`
`3`	`3`	`file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)`
`4`	`4`
`5`		`-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})`
	`5`	`+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ set(robotname iCubDarmstadt01)`
`2`	`2`
`3`	`3`	`file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)`
`4`	`4`
`5`		`-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})`
	`5`	`+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ set(robotname iCubGazeboV2_5)`
`2`	`2`
`3`	`3`	`file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)`
`4`	`4`
`5`		`-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})`
	`5`	`+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ set(robotname iCubGenova01)`
`2`	`2`
`3`	`3`	`file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)`
`4`	`4`
`5`		`-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})`
	`5`	`+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ set(robotname iCubHeidelberg01)`
`2`	`2`
`3`	`3`	`file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)`
`4`	`4`
`5`		`-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})`
	`5`	`+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ set(robotname iCubNancy01)`
`2`	`2`
`3`	`3`	`file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)`
`4`	`4`
`5`		`-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})`
	`5`	`+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ set(robotname iCubParis01)`
`2`	`2`
`3`	`3`	`file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)`
`4`	`4`
`5`		`-yarp_install(FILES ${ini} DESTINATION ${WBC_ROBOTS_INSTALL_DIR}/${robotname})`
	`5`	`+yarp_install(FILES ${ini} DESTINATION ${YARP_ROBOTS_INSTALL_DIR}/${robotname})`