Skip to content

Commit 9543f5f

Browse files
traversarotraversaro
authored
Merge pull request #1512 from robotology/fix68
Always use CMAKE_ARGS in place of CMAKE_CACHE_ARGS in Build<...>.cmake scripts
2 parents 32787b7 + f525de1 commit 9543f5f

5 files changed

+42
-42
lines changed

‎cmake/BuildICUB.cmake

+38-38
Original file line numberDiff line numberDiff line change
@@ -61,44 +61,44 @@ ycm_ep_helper(ICUB TYPE GIT
6161
COMPONENT iCub
6262
FOLDER src
6363
CMAKE_ARGS -DICUB_INSTALL_WITH_RPATH:BOOL=ON
64-
CMAKE_CACHE_ARGS -DENABLE_icubmod_cartesiancontrollerserver:BOOL=ON
65-
-DENABLE_icubmod_cartesiancontrollerclient:sBOOL=ON
66-
-DENABLE_icubmod_gazecontrollerclient:BOOL=ON
67-
-DENABLE_icubmod_serial:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
68-
-DENABLE_icubmod_serialport:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
69-
-DENABLE_icubmod_skinWrapper:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
70-
-DENABLE_icubmod_dragonfly2:BOOL=${ENABLE_DRAGONFLY2}
71-
-DENABLE_icubmod_portaudio:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
72-
-DENABLE_icubmod_sharedcan:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
73-
-DENABLE_icubmod_bcbBattery:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
74-
-DENABLE_icubmod_canmotioncontrol:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
75-
-DENABLE_icubmod_canBusAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
76-
-DENABLE_icubmod_canBusInertialMTB:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
77-
-DENABLE_icubmod_canBusSkin:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
78-
-DENABLE_icubmod_canBusFtSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
79-
-DENABLE_icubmod_canBusVirtualAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
80-
-DENABLE_icubmod_cfw2can:BOOL=${ROBOTOLOGY_USES_CFW2CAN}
81-
-DENABLE_icubmod_ecan:BOOL=${ROBOTOLOGY_USES_ESDCAN}
82-
-DENABLE_icubmod_embObjBattery:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
83-
-DENABLE_icubmod_embObjFTsensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
84-
-DENABLE_icubmod_embObjMultipleFTsensors:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
85-
-DENABLE_icubmod_embObjIMU:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
86-
-DENABLE_icubmod_embObjInertials:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
87-
-DENABLE_icubmod_embObjMais:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
88-
-DENABLE_icubmod_embObjMotionControl:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
89-
-DENABLE_icubmod_embObjSkin:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
90-
-DENABLE_icubmod_embObjVirtualAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
91-
-DENABLE_icubmod_parametricCalibrator:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
92-
-DENABLE_icubmod_parametricCalibratorEth:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
93-
-DENABLE_icubmod_embObjPOS:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
94-
-DENABLE_icubmod_xsensmtx:BOOL=${ENABLE_icubmod_xsensmtx}
95-
-DENABLE_icubmod_socketcan:BOOL=${ENABLE_icubmod_socketcan}
96-
-DICUB_USE_icub_firmware_shared:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
97-
-DICUBMAIN_COMPILE_SIMULATORS:BOOL=${ICUBMAIN_COMPILE_SIMULATORS}
98-
-DICUB_COMPILE_BINDINGS:BOOL=${ICUB_COMPILE_BINDINGS}
99-
-DCREATE_PYTHON:BOOL=${ROBOTOLOGY_USES_PYTHON}
100-
-DCREATE_LUA:BOOL=${ROBOTOLOGY_USES_LUA}
101-
${ICUB_PYTHON_INSTALL_CMAKE_ARGS})
64+
-DENABLE_icubmod_cartesiancontrollerserver:BOOL=ON
65+
-DENABLE_icubmod_cartesiancontrollerclient:sBOOL=ON
66+
-DENABLE_icubmod_gazecontrollerclient:BOOL=ON
67+
-DENABLE_icubmod_serial:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
68+
-DENABLE_icubmod_serialport:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
69+
-DENABLE_icubmod_skinWrapper:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
70+
-DENABLE_icubmod_dragonfly2:BOOL=${ENABLE_DRAGONFLY2}
71+
-DENABLE_icubmod_portaudio:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
72+
-DENABLE_icubmod_sharedcan:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
73+
-DENABLE_icubmod_bcbBattery:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
74+
-DENABLE_icubmod_canmotioncontrol:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
75+
-DENABLE_icubmod_canBusAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
76+
-DENABLE_icubmod_canBusInertialMTB:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
77+
-DENABLE_icubmod_canBusSkin:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
78+
-DENABLE_icubmod_canBusFtSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
79+
-DENABLE_icubmod_canBusVirtualAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
80+
-DENABLE_icubmod_cfw2can:BOOL=${ROBOTOLOGY_USES_CFW2CAN}
81+
-DENABLE_icubmod_ecan:BOOL=${ROBOTOLOGY_USES_ESDCAN}
82+
-DENABLE_icubmod_embObjBattery:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
83+
-DENABLE_icubmod_embObjFTsensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
84+
-DENABLE_icubmod_embObjMultipleFTsensors:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
85+
-DENABLE_icubmod_embObjIMU:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
86+
-DENABLE_icubmod_embObjInertials:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
87+
-DENABLE_icubmod_embObjMais:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
88+
-DENABLE_icubmod_embObjMotionControl:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
89+
-DENABLE_icubmod_embObjSkin:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
90+
-DENABLE_icubmod_embObjVirtualAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
91+
-DENABLE_icubmod_parametricCalibrator:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
92+
-DENABLE_icubmod_parametricCalibratorEth:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
93+
-DENABLE_icubmod_embObjPOS:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
94+
-DENABLE_icubmod_xsensmtx:BOOL=${ENABLE_icubmod_xsensmtx}
95+
-DENABLE_icubmod_socketcan:BOOL=${ENABLE_icubmod_socketcan}
96+
-DICUB_USE_icub_firmware_shared:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD}
97+
-DICUBMAIN_COMPILE_SIMULATORS:BOOL=${ICUBMAIN_COMPILE_SIMULATORS}
98+
-DICUB_COMPILE_BINDINGS:BOOL=${ICUB_COMPILE_BINDINGS}
99+
-DCREATE_PYTHON:BOOL=${ROBOTOLOGY_USES_PYTHON}
100+
-DCREATE_LUA:BOOL=${ROBOTOLOGY_USES_LUA}
101+
${ICUB_PYTHON_INSTALL_CMAKE_ARGS})
102102

103103
set(ICUB_CONDA_DEPENDENCIES ace libopencv gsl ipopt libode qt-main sdl)
104104

‎cmake/Buildblocktest-yarp-plugins.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ ycm_ep_helper(blocktest-yarp-plugins TYPE GIT
1616
FOLDER src
1717
DEPENDS YARP
1818
blocktestcore
19-
CMAKE_CACHE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF)
19+
CMAKE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF)
2020

2121
set(blocktest-yarp-plugins_CONDA_DEPENDENCIES boost-cpp)

‎cmake/Buildblocktestcore.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ycm_ep_helper(blocktestcore TYPE GIT
1010
TAG master
1111
COMPONENT core
1212
FOLDER src
13-
CMAKE_CACHE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF
13+
CMAKE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF
1414
DEPENDS YCM)
1515

1616
set(blocktestcore_CONDA_DEPENDENCIES qt-main boost-cpp)

‎cmake/Buildspeech.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ ycm_ep_helper(speech TYPE GIT
1616
ICUB
1717
ICUBcontrib
1818
COMPONENT ICUB_BASIC_DEMOS
19-
CMAKE_CACHE_ARGS -DBUILD_SVOX_SPEECH:BOOL=ON
19+
CMAKE_ARGS -DBUILD_SVOX_SPEECH:BOOL=ON
2020
FOLDER src)

‎cmake/Buildyarp-devices-forcetorque.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ ycm_ep_helper(yarp-devices-forcetorque TYPE GIT
1313
COMPONENT iCub
1414
FOLDER src
1515
DEPENDS YARP
16-
CMAKE_CACHE_ARGS -DENABLE_ftshoe:BOOL=ON)
16+
CMAKE_ARGS -DENABLE_ftshoe:BOOL=ON)
1717

0 commit comments

Comments
 (0)