From 19672f0f2c3da27e2e3768c68c322ebcdccc8b15 Mon Sep 17 00:00:00 2001 From: Gabriele Sisinna Date: Fri, 13 May 2022 15:19:29 +0200 Subject: [PATCH 1/2] Fix path for icub-tests context --- cmake/template/setup.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/template/setup.sh.in b/cmake/template/setup.sh.in index 4bc1c50c7..5140bbfe8 100644 --- a/cmake/template/setup.sh.in +++ b/cmake/template/setup.sh.in @@ -30,7 +30,7 @@ export GAZEBO_MODEL_PATH=${GAZEBO_MODEL_PATH:+${GAZEBO_MODEL_PATH}:}${ROBOTOLOGY @cmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING export @SHLIB_ENV_VAR@=$@SHLIB_ENV_VAR@:$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/lib/robottestingframework -export YARP_DATA_DIRS=$YARP_DATA_DIRS:@PROJECT_SOURCE_DIR@/robotology/icub-tests/suites +export YARP_DATA_DIRS=$YARP_DATA_DIRS:@PROJECT_SOURCE_DIR_SETUP_SH@/src/icub-tests/suites export BLOCKTEST_RESOURCE_PATH=${ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX}/bin @endcmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING From 1f6c9161ebb368dd3ed5d69923d7f9808a37eefb Mon Sep 17 00:00:00 2001 From: Gabriele Sisinna Date: Fri, 13 May 2022 16:04:59 +0200 Subject: [PATCH 2/2] Fix icub-tests path and env variable --- cmake/template/addPathsToUserEnvVariables.ps1.in | 2 +- cmake/template/removePathsFromUserEnvVariables.ps1.in | 2 +- cmake/template/setup.bat.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/template/addPathsToUserEnvVariables.ps1.in b/cmake/template/addPathsToUserEnvVariables.ps1.in index 13a7633db..9c87c0c33 100644 --- a/cmake/template/addPathsToUserEnvVariables.ps1.in +++ b/cmake/template/addPathsToUserEnvVariables.ps1.in @@ -60,7 +60,7 @@ Add-ValueToUserEnvVariable GAZEBO_RESOURCE_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_P @cmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING # ROBOTOLOGY_ENABLE_ROBOT_TESTING-specific lines Add-ValueToUserEnvVariable PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\lib\robottestingframework"; -Add-ValueToUserEnvVariable YARP_DATA_DIRS "@PROJECT_SOURCE_DIR_NATIVE_PATH@\robotology\icub-tests\suites"; +Add-ValueToUserEnvVariable YARP_DATA_DIRS "@PROJECT_SOURCE_DIR_NATIVE_PATH@\src\icub-tests\suites"; Add-ValueToUserEnvVariable BLOCKTEST_RESOURCE_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\bin"; @endcmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING diff --git a/cmake/template/removePathsFromUserEnvVariables.ps1.in b/cmake/template/removePathsFromUserEnvVariables.ps1.in index 04b1f5616..a66450e7f 100644 --- a/cmake/template/removePathsFromUserEnvVariables.ps1.in +++ b/cmake/template/removePathsFromUserEnvVariables.ps1.in @@ -63,7 +63,7 @@ Remove-ValueFromUserEnvVariable GAZEBO_RESOURCE_PATH $ROBOTOLOGY_SUPERBUILD_INST @cmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING # Cleanup ROBOTOLOGY_ENABLE_ROBOT_TESTING-specific lines Remove-ValueFromUserEnvVariable PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\lib\robottestingframework"; -Remove-ValueFromUserEnvVariable YARP_DATA_DIRS "@PROJECT_SOURCE_DIR_NATIVE_PATH@\robotology\icub-tests\suites"; +Remove-ValueFromUserEnvVariable YARP_DATA_DIRS "@PROJECT_SOURCE_DIR_NATIVE_PATH@\src\icub-tests\suites"; Remove-ValueFromUserEnvVariable BLOCKTEST_RESOURCE_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\bin"; @endcmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING diff --git a/cmake/template/setup.bat.in b/cmake/template/setup.bat.in index d45a7fac9..a889ecaa2 100644 --- a/cmake/template/setup.bat.in +++ b/cmake/template/setup.bat.in @@ -27,7 +27,7 @@ set "GAZEBO_RESOURCE_PATH=%GAZEBO_RESOURCE_PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_ @cmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING set "PATH=%PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\lib\robottestingframework -set "YARP_DATA_DIRS=%YARP_DATA_DIRS%;@PROJECT_SOURCE_DIR@\robotology\icub-tests\suites" +set "YARP_DATA_DIRS=%YARP_DATA_DIRS%;@PROJECT_SOURCE_DIR_NATIVE_PATH@\src\icub-tests\suites" set "BLOCKTEST_RESOURCE_PATH"=%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\bin @endcmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING