Skip to content

Commit b8c3fe4

Browse files
committed
update to the use of icub-contrib-common helper package
1 parent 8a55522 commit b8c3fe4

File tree

56 files changed

+383
-372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+383
-372
lines changed

CMakeLists.txt

+81-70
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,93 @@
1+
# Copyright: (C) 2016 iCub Facility - Istituto Italiano di Tecnologia
2+
# Authors: Ugo Pattacini
3+
# CopyPolicy: Released under the terms of the GNU GPL v2.0.
14

2-
option(ICUB_INSTALL_ALL_ROBOTS "Enable installation of all robots" OFF)
5+
cmake_minimum_required(VERSION 2.8.9)
6+
project(robots-configuration)
37

4-
set(ROBOT_NAME "$ENV{YARP_ROBOT_NAME}" CACHE PATH
5-
"Name of your robot")
8+
find_package(YARP REQUIRED)
9+
find_package(ICUBcontrib REQUIRED)
610

11+
list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
12+
list(APPEND CMAKE_MODULE_PATH ${ICUBCONTRIB_MODULE_PATH})
13+
14+
include(YarpInstallationHelpers)
15+
include(ICUBcontribOptions)
16+
include(ICUBcontribHelpers)
17+
18+
option(INSTALL_ALL_ROBOTS "Enable installation of all robots" OFF)
19+
set(ROBOT_NAME "$ENV{YARP_ROBOT_NAME}" CACHE PATH "Name of your robot")
720
set(ROBOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${ROBOT_NAME}")
821

9-
if(ICUB_INSTALL_ALL_ROBOTS) # Install all robot-specific files
10-
add_subdirectory(vizzy)
11-
add_subdirectory(iCubAberystwyth01)
12-
add_subdirectory(iCubAbuDhabi01)
13-
add_subdirectory(iCubAnkara01)
14-
add_subdirectory(iCubBarcelona01)
15-
add_subdirectory(iCubBielefeld01)
16-
add_subdirectory(iCubBielefeld02)
17-
add_subdirectory(iCubBielefeld03)
18-
#add_subdirectory(iCubBremen01)
19-
add_subdirectory(iCubChemnitz01)
20-
add_subdirectory(iCubDaejeon01)
21-
add_subdirectory(iCubEdinburgh01)
22-
add_subdirectory(iCubFrankfurt01)
23-
add_subdirectory(iCubGenova01)
24-
add_subdirectory(iCubGenova03)
25-
add_subdirectory(iCubNancy01)
26-
add_subdirectory(iCubGrenoble01)
27-
add_subdirectory(iCubHamburg01)
28-
add_subdirectory(iCubHertfordshire01)
29-
add_subdirectory(iCubHertfordshire02)
30-
add_subdirectory(iCubKarlsruhe01)
31-
add_subdirectory(iCubLausanne01)
32-
add_subdirectory(iCubLisboa01)
33-
add_subdirectory(iCubLisboa02)
34-
add_subdirectory(iCubLondon01)
35-
add_subdirectory(iCubLugano01)
36-
add_subdirectory(iCubLyon01)
37-
add_subdirectory(iCubMunich01)
38-
add_subdirectory(Nottingham01)
39-
add_subdirectory(iCubOffenbach01)
40-
add_subdirectory(iCubOffenbach02)
41-
add_subdirectory(iCubOsaka01)
42-
add_subdirectory(iCubParis01)
43-
add_subdirectory(iCubParis02)
44-
add_subdirectory(iCubPlymouth01)
45-
add_subdirectory(iCubPlymouth02)
46-
add_subdirectory(iCubPrototype01)
47-
add_subdirectory(iCubRome01)
48-
add_subdirectory(iCubRome02)
49-
add_subdirectory(iCubSheffield01)
50-
add_subdirectory(iCubTwente01)
51-
add_subdirectory(iCubUrbana01)
52-
add_subdirectory(iCubZurich01)
53-
add_subdirectory(SkinTableTop)
22+
if(INSTALL_ALL_ROBOTS)
23+
add_subdirectory(iCubAberystwyth01)
24+
add_subdirectory(iCubAbuDhabi01)
25+
add_subdirectory(iCubAnkara01)
26+
add_subdirectory(iCubBarcelona01)
27+
add_subdirectory(iCubBielefeld01)
28+
add_subdirectory(iCubBielefeld02)
29+
add_subdirectory(iCubBielefeld03)
30+
add_subdirectory(iCubChemnitz01)
31+
add_subdirectory(iCubDaejeon01)
32+
add_subdirectory(iCubEdinburgh01)
33+
add_subdirectory(iCubFrankfurt01)
34+
add_subdirectory(iCubGenova01)
35+
add_subdirectory(iCubGenova03)
36+
add_subdirectory(iCubNancy01)
37+
add_subdirectory(iCubGrenoble01)
38+
add_subdirectory(iCubHamburg01)
39+
add_subdirectory(iCubHertfordshire01)
40+
add_subdirectory(iCubHertfordshire02)
41+
add_subdirectory(iCubKarlsruhe01)
42+
add_subdirectory(iCubLausanne01)
43+
add_subdirectory(iCubLisboa01)
44+
add_subdirectory(iCubLisboa02)
45+
add_subdirectory(iCubLondon01)
46+
add_subdirectory(iCubLugano01)
47+
add_subdirectory(iCubLyon01)
48+
add_subdirectory(iCubMunich01)
49+
add_subdirectory(Nottingham01)
50+
add_subdirectory(iCubOffenbach01)
51+
add_subdirectory(iCubOffenbach02)
52+
add_subdirectory(iCubOsaka01)
53+
add_subdirectory(iCubParis01)
54+
add_subdirectory(iCubParis02)
55+
add_subdirectory(iCubPlymouth01)
56+
add_subdirectory(iCubPlymouth02)
57+
add_subdirectory(iCubPrototype01)
58+
add_subdirectory(iCubRome01)
59+
add_subdirectory(iCubRome02)
60+
add_subdirectory(iCubSheffield01)
61+
add_subdirectory(iCubTwente01)
62+
add_subdirectory(iCubUrbana01)
63+
add_subdirectory(iCubZurich01)
5464
else()
55-
56-
if (ROBOT_NAME)
57-
if(IS_DIRECTORY ${ROBOT_DIR})
58-
add_subdirectory(${ROBOT_NAME})
65+
if(ROBOT_NAME)
66+
if(IS_DIRECTORY ${ROBOT_DIR})
67+
add_subdirectory(${ROBOT_NAME})
68+
endif()
5969
endif()
60-
endif()
6170
endif()
6271

63-
#setup symbolic link (on UNIX...)
64-
65-
if ("${ROBOT_NAME}" STREQUAL "")
66-
message(STATUS "No robot name")
67-
else ("${ROBOT_NAME}" STREQUAL "")
68-
if (EXISTS ${ROBOT_DIR})
69-
if(UNIX)
70-
message(STATUS "Setting up symbolic link for ${ROBOT_NAME}")
71-
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_INSTALL_PREFIX}/${ICUB_ROBOTS_INSTALL_DIR}/${ROBOT_NAME})\n
72-
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_INSTALL_PREFIX}/${ICUB_ROBOTS_INSTALL_DIR}/${ROBOT_NAME} ${CMAKE_INSTALL_PREFIX}/${ICUB_ROBOTS_INSTALL_DIR}/default)")
73-
add_custom_target(robotSymLink ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/${ICUB_ROBOTS_INSTALL_DIR}/${ROBOT_NAME} ${CMAKE_BINARY_DIR}/${ICUB_ROBOTS_INSTALL_DIR}/default DEPENDS ${CMAKE_BINARY_DIR}/${ICUB_ROBOTS_INSTALL_DIR}/${ROBOT_NAME})
72+
# setup symbolic link (on UNIX...)
73+
if("${ROBOT_NAME}" STREQUAL "")
74+
message(STATUS "No robot name")
75+
else()
76+
if(EXISTS ${ROBOT_DIR})
77+
if(UNIX)
78+
message(STATUS "Setting up symbolic link for ${ROBOT_NAME}")
79+
install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_INSTALL_PREFIX}/${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${ROBOT_NAME})\n
80+
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_INSTALL_PREFIX}/${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${ROBOT_NAME}\n
81+
${CMAKE_INSTALL_PREFIX}/${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/default)")
82+
add_custom_target(robotSymLink ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${ROBOT_NAME}
83+
${CMAKE_BINARY_DIR}/${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/default
84+
DEPENDS ${CMAKE_BINARY_DIR}/${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${ROBOT_NAME})
85+
else()
86+
message(STATUS "Cannot set up symbolic link for ${ROBOT_NAME} on this OS, please set the YARP_ROBOT_NAME environment variable to ${ROBOT_NAME}")
87+
endif()
7488
else()
75-
message(STATUS "Cannot set up symbolic link for ${ROBOT_NAME} on this OS, please set the YARP_ROBOT_NAME environment variable to ${ROBOT_NAME}")
89+
message(WARNING "ROBOT_NAME is set to ${ROBOT_NAME} but the ${ROBOT_DIR} directory does not exist")
7690
endif()
91+
endif()
7792

78-
else(EXISTS ${ROBOT_DIR})
79-
message(WARNING "ROBOT_NAME is set to ${ROBOT_NAME} but the app/robots/${ROBOT_NAME} directory does not exist")
80-
endif(EXISTS ${ROBOT_DIR})
81-
endif ("${ROBOT_NAME}" STREQUAL "")
82-
93+
icubcontrib_add_uninstall_target()

SkinFingertipDemo/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ set(appname SkinFingertipDemo)
33
file(GLOB xml ${CMAKE_CURRENT_SOURCE_DIR}/*.xml)
44
file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
55

6-
yarp_install(FILES ${xml} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
7-
yarp_install(FILES ${ini} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
8-
yarp_install(DIRECTORY wrappers DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
9-
yarp_install(DIRECTORY hardware DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
6+
yarp_install(FILES ${xml} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
7+
yarp_install(FILES ${ini} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
8+
yarp_install(DIRECTORY wrappers DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
9+
yarp_install(DIRECTORY hardware DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
1010

1111

SkinTableTop/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ set(appname SkinTableTop)
33
file(GLOB xml ${CMAKE_CURRENT_SOURCE_DIR}/*.xml)
44
file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
55

6-
yarp_install(FILES ${xml} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
7-
yarp_install(FILES ${ini} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
8-
yarp_install(DIRECTORY wrappers DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
9-
yarp_install(DIRECTORY hardware DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
6+
yarp_install(FILES ${xml} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
7+
yarp_install(FILES ${ini} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
8+
yarp_install(DIRECTORY wrappers DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
9+
yarp_install(DIRECTORY hardware DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
1010

1111

experimentalSetups/panHead/CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ file(GLOB xml ${CMAKE_CURRENT_SOURCE_DIR}/*.xml)
44
file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
55
set(whatsleft firmwareUpdate.txt)
66

7-
yarp_install(FILES ${xml} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
8-
yarp_install(FILES ${ini} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
9-
yarp_install(FILES ${whatsleft} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
10-
yarp_install(DIRECTORY calibrators DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
11-
yarp_install(DIRECTORY wrappers DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
12-
yarp_install(DIRECTORY hardware DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
13-
yarp_install(DIRECTORY camera DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
7+
yarp_install(FILES ${xml} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
8+
yarp_install(FILES ${ini} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
9+
yarp_install(FILES ${whatsleft} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
10+
yarp_install(DIRECTORY calibrators DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
11+
yarp_install(DIRECTORY wrappers DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
12+
yarp_install(DIRECTORY hardware DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
13+
yarp_install(DIRECTORY camera DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
1414

iCubAberystwyth01/CMakeLists.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ file(GLOB xml ${CMAKE_CURRENT_SOURCE_DIR}/*.xml)
44
file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
55
set(whatsleft firmwareUpdate.txt)
66

7-
yarp_install(FILES ${xml} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
8-
yarp_install(FILES ${ini} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
9-
yarp_install(FILES ${whatsleft} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
10-
yarp_install(DIRECTORY calibrators DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
11-
yarp_install(DIRECTORY cartesian DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
12-
yarp_install(DIRECTORY wrappers DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
13-
yarp_install(DIRECTORY hardware DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
14-
yarp_install(DIRECTORY camera DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
7+
yarp_install(FILES ${xml} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
8+
yarp_install(FILES ${ini} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
9+
yarp_install(FILES ${whatsleft} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
10+
yarp_install(DIRECTORY calibrators DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
11+
yarp_install(DIRECTORY cartesian DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
12+
yarp_install(DIRECTORY wrappers DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
13+
yarp_install(DIRECTORY hardware DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
14+
yarp_install(DIRECTORY camera DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
1515

1616

1717

iCubAbuDhabi01/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ file(GLOB scripts ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.xml)
44
file(GLOB firmware ${CMAKE_CURRENT_SOURCE_DIR}/scripts/firmwareUpdate.txt)
55
file(GLOB conf ${CMAKE_CURRENT_SOURCE_DIR}/conf/*.ini)
66

7-
yarp_install(FILES ${conf} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
8-
yarp_install(DIRECTORY conf/camera DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
7+
yarp_install(FILES ${conf} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
8+
yarp_install(DIRECTORY conf/camera DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})

iCubAnkara01/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ file(GLOB scripts ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.xml)
44
file(GLOB firmware ${CMAKE_CURRENT_SOURCE_DIR}/scripts/firmwareUpdate.txt)
55
file(GLOB conf ${CMAKE_CURRENT_SOURCE_DIR}/conf/*.ini)
66

7-
yarp_install(FILES ${scripts} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
8-
yarp_install(FILES ${conf} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
9-
yarp_install(DIRECTORY conf/camera DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
7+
yarp_install(FILES ${scripts} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
8+
yarp_install(FILES ${conf} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
9+
yarp_install(DIRECTORY conf/camera DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
1010

iCubBarcelona01/CMakeLists.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ file(GLOB xml ${CMAKE_CURRENT_SOURCE_DIR}/*.xml)
44
file(GLOB ini ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
55
set(whatsleft firmwareUpdate.txt)
66

7-
yarp_install(FILES ${xml} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
8-
yarp_install(FILES ${ini} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
9-
yarp_install(FILES ${whatsleft} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
10-
yarp_install(DIRECTORY calibrators DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
11-
yarp_install(DIRECTORY cartesian DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
12-
yarp_install(DIRECTORY wrappers DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
13-
yarp_install(DIRECTORY hardware DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
14-
yarp_install(DIRECTORY camera DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
7+
yarp_install(FILES ${xml} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
8+
yarp_install(FILES ${ini} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
9+
yarp_install(FILES ${whatsleft} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
10+
yarp_install(DIRECTORY calibrators DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
11+
yarp_install(DIRECTORY cartesian DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
12+
yarp_install(DIRECTORY wrappers DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
13+
yarp_install(DIRECTORY hardware DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
14+
yarp_install(DIRECTORY camera DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
1515

1616

1717

iCubBielefeld01/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ file(GLOB scripts ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.xml)
44
set(firmware ${CMAKE_CURRENT_SOURCE_DIR}/scripts/firmwareUpdate.txt)
55
file(GLOB conf ${CMAKE_CURRENT_SOURCE_DIR}/conf/*.ini)
66

7-
yarp_install(FILES ${scripts} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
8-
yarp_install(FILES ${firmware} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
9-
yarp_install(FILES ${conf} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
10-
yarp_install(DIRECTORY conf/camera DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
7+
yarp_install(FILES ${scripts} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
8+
yarp_install(FILES ${firmware} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
9+
yarp_install(FILES ${conf} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
10+
yarp_install(DIRECTORY conf/camera DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})

iCubBielefeld02/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ file(GLOB scripts ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.xml)
44
file(GLOB firmware ${CMAKE_CURRENT_SOURCE_DIR}/scripts/firmwareUpdate.txt)
55
file(GLOB conf ${CMAKE_CURRENT_SOURCE_DIR}/conf/*.ini)
66

7-
yarp_install(FILES ${scripts} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
8-
yarp_install(FILES ${conf} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
9-
yarp_install(DIRECTORY conf/camera DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
7+
yarp_install(FILES ${scripts} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
8+
yarp_install(FILES ${conf} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
9+
yarp_install(DIRECTORY conf/camera DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
1010

iCubBielefeld03/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ file(GLOB scripts ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.xml)
44
set(firmware ${CMAKE_CURRENT_SOURCE_DIR}/scripts/firmwareUpdate.txt)
55
file(GLOB conf ${CMAKE_CURRENT_SOURCE_DIR}/conf/*.ini)
66

7-
yarp_install(FILES ${scripts} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
8-
yarp_install(FILES ${firmware} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
9-
yarp_install(FILES ${conf} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
10-
yarp_install(DIRECTORY conf/camera DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
7+
yarp_install(FILES ${scripts} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
8+
yarp_install(FILES ${firmware} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}/scripts)
9+
yarp_install(FILES ${conf} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
10+
yarp_install(DIRECTORY conf/camera DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
1111

iCubChemnitz01/CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ set(appname iCubChemnitz01)
22

33
set(scripts icub_all.xml firmwareUpdate.txt yarprobotinterface.ini)
44

5-
yarp_install(FILES ${scripts} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
6-
yarp_install(FILES ${dragonFly} DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname})
7-
yarp_install(DIRECTORY calibrators DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
8-
yarp_install(DIRECTORY cartesian DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
9-
yarp_install(DIRECTORY wrappers DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
10-
yarp_install(DIRECTORY hardware DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
11-
yarp_install(DIRECTORY camera DESTINATION ${ICUB_ROBOTS_INSTALL_DIR}/${appname} PATTERN .svn EXCLUDE)
5+
yarp_install(FILES ${scripts} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
6+
yarp_install(FILES ${dragonFly} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
7+
yarp_install(DIRECTORY calibrators DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
8+
yarp_install(DIRECTORY cartesian DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
9+
yarp_install(DIRECTORY wrappers DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
10+
yarp_install(DIRECTORY hardware DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
11+
yarp_install(DIRECTORY camera DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname})
1212

0 commit comments

Comments
 (0)