From f525de150a45f1457d6befc26c1452551043c3d3 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 30 Oct 2023 11:51:35 +0100 Subject: [PATCH] Always use CMAKE_ARGS in place of CMAKE_CACHE_ARGS in Build<...>.cmake scripts --- cmake/BuildICUB.cmake | 76 +++++++++++------------ cmake/Buildblocktest-yarp-plugins.cmake | 2 +- cmake/Buildblocktestcore.cmake | 2 +- cmake/Buildspeech.cmake | 2 +- cmake/Buildyarp-devices-forcetorque.cmake | 2 +- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/cmake/BuildICUB.cmake b/cmake/BuildICUB.cmake index a9bdeb2eb..7d922ef9f 100644 --- a/cmake/BuildICUB.cmake +++ b/cmake/BuildICUB.cmake @@ -61,44 +61,44 @@ ycm_ep_helper(ICUB TYPE GIT COMPONENT iCub FOLDER src CMAKE_ARGS -DICUB_INSTALL_WITH_RPATH:BOOL=ON - CMAKE_CACHE_ARGS -DENABLE_icubmod_cartesiancontrollerserver:BOOL=ON - -DENABLE_icubmod_cartesiancontrollerclient:sBOOL=ON - -DENABLE_icubmod_gazecontrollerclient:BOOL=ON - -DENABLE_icubmod_serial:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_serialport:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_skinWrapper:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_dragonfly2:BOOL=${ENABLE_DRAGONFLY2} - -DENABLE_icubmod_portaudio:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_sharedcan:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_bcbBattery:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_canmotioncontrol:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_canBusAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_canBusInertialMTB:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_canBusSkin:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_canBusFtSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_canBusVirtualAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_cfw2can:BOOL=${ROBOTOLOGY_USES_CFW2CAN} - -DENABLE_icubmod_ecan:BOOL=${ROBOTOLOGY_USES_ESDCAN} - -DENABLE_icubmod_embObjBattery:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_embObjFTsensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_embObjMultipleFTsensors:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_embObjIMU:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_embObjInertials:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_embObjMais:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_embObjMotionControl:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_embObjSkin:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_embObjVirtualAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_parametricCalibrator:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_parametricCalibratorEth:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_embObjPOS:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DENABLE_icubmod_xsensmtx:BOOL=${ENABLE_icubmod_xsensmtx} - -DENABLE_icubmod_socketcan:BOOL=${ENABLE_icubmod_socketcan} - -DICUB_USE_icub_firmware_shared:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} - -DICUBMAIN_COMPILE_SIMULATORS:BOOL=${ICUBMAIN_COMPILE_SIMULATORS} - -DICUB_COMPILE_BINDINGS:BOOL=${ICUB_COMPILE_BINDINGS} - -DCREATE_PYTHON:BOOL=${ROBOTOLOGY_USES_PYTHON} - -DCREATE_LUA:BOOL=${ROBOTOLOGY_USES_LUA} - ${ICUB_PYTHON_INSTALL_CMAKE_ARGS}) + -DENABLE_icubmod_cartesiancontrollerserver:BOOL=ON + -DENABLE_icubmod_cartesiancontrollerclient:sBOOL=ON + -DENABLE_icubmod_gazecontrollerclient:BOOL=ON + -DENABLE_icubmod_serial:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_serialport:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_skinWrapper:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_dragonfly2:BOOL=${ENABLE_DRAGONFLY2} + -DENABLE_icubmod_portaudio:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_sharedcan:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_bcbBattery:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_canmotioncontrol:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_canBusAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_canBusInertialMTB:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_canBusSkin:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_canBusFtSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_canBusVirtualAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_cfw2can:BOOL=${ROBOTOLOGY_USES_CFW2CAN} + -DENABLE_icubmod_ecan:BOOL=${ROBOTOLOGY_USES_ESDCAN} + -DENABLE_icubmod_embObjBattery:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_embObjFTsensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_embObjMultipleFTsensors:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_embObjIMU:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_embObjInertials:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_embObjMais:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_embObjMotionControl:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_embObjSkin:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_embObjVirtualAnalogSensor:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_parametricCalibrator:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_parametricCalibratorEth:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_embObjPOS:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DENABLE_icubmod_xsensmtx:BOOL=${ENABLE_icubmod_xsensmtx} + -DENABLE_icubmod_socketcan:BOOL=${ENABLE_icubmod_socketcan} + -DICUB_USE_icub_firmware_shared:BOOL=${ROBOTOLOGY_ENABLE_ICUB_HEAD} + -DICUBMAIN_COMPILE_SIMULATORS:BOOL=${ICUBMAIN_COMPILE_SIMULATORS} + -DICUB_COMPILE_BINDINGS:BOOL=${ICUB_COMPILE_BINDINGS} + -DCREATE_PYTHON:BOOL=${ROBOTOLOGY_USES_PYTHON} + -DCREATE_LUA:BOOL=${ROBOTOLOGY_USES_LUA} + ${ICUB_PYTHON_INSTALL_CMAKE_ARGS}) set(ICUB_CONDA_DEPENDENCIES ace libopencv gsl ipopt libode qt-main sdl) diff --git a/cmake/Buildblocktest-yarp-plugins.cmake b/cmake/Buildblocktest-yarp-plugins.cmake index 060ec68ca..44c47b21c 100644 --- a/cmake/Buildblocktest-yarp-plugins.cmake +++ b/cmake/Buildblocktest-yarp-plugins.cmake @@ -16,6 +16,6 @@ ycm_ep_helper(blocktest-yarp-plugins TYPE GIT FOLDER src DEPENDS YARP blocktestcore - CMAKE_CACHE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF) + CMAKE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF) set(blocktest-yarp-plugins_CONDA_DEPENDENCIES boost-cpp) diff --git a/cmake/Buildblocktestcore.cmake b/cmake/Buildblocktestcore.cmake index 0c08b5202..e843de8bf 100644 --- a/cmake/Buildblocktestcore.cmake +++ b/cmake/Buildblocktestcore.cmake @@ -10,7 +10,7 @@ ycm_ep_helper(blocktestcore TYPE GIT TAG master COMPONENT core FOLDER src - CMAKE_CACHE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF + CMAKE_ARGS -DENABLE_MSVC_WARNINGS:BOOL=OFF DEPENDS YCM) set(blocktestcore_CONDA_DEPENDENCIES qt-main boost-cpp) diff --git a/cmake/Buildspeech.cmake b/cmake/Buildspeech.cmake index dfcb88c54..9c93b1bb0 100644 --- a/cmake/Buildspeech.cmake +++ b/cmake/Buildspeech.cmake @@ -16,5 +16,5 @@ ycm_ep_helper(speech TYPE GIT ICUB ICUBcontrib COMPONENT ICUB_BASIC_DEMOS - CMAKE_CACHE_ARGS -DBUILD_SVOX_SPEECH:BOOL=ON + CMAKE_ARGS -DBUILD_SVOX_SPEECH:BOOL=ON FOLDER src) diff --git a/cmake/Buildyarp-devices-forcetorque.cmake b/cmake/Buildyarp-devices-forcetorque.cmake index 80e4dfce7..d759c903c 100644 --- a/cmake/Buildyarp-devices-forcetorque.cmake +++ b/cmake/Buildyarp-devices-forcetorque.cmake @@ -13,5 +13,5 @@ ycm_ep_helper(yarp-devices-forcetorque TYPE GIT COMPONENT iCub FOLDER src DEPENDS YARP - CMAKE_CACHE_ARGS -DENABLE_ftshoe:BOOL=ON) + CMAKE_ARGS -DENABLE_ftshoe:BOOL=ON)