Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed setting of variables in Windows #1588

Merged
merged 1 commit into from
Jan 29, 2024
Merged

Fixed setting of variables in Windows #1588

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmake/template/setup.bat.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set "ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX=@YCM_EP_INSTALL_DIR_NATIVE_PATH@"
rem Extend PATH
set "PATH=%PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\bin"
rem YARP related env variables (see http://www.yarp.it/yarp_data_dirs.html )
set "YARP_DATA_DIRS=%YARP_DATA_DIRS%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\yarp;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\iCub;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\ICUBcontrib";%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\ergoCub"
set "YARP_DATA_DIRS=%YARP_DATA_DIRS%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\yarp;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\iCub;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\ICUBcontrib;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\ergoCub"
rem Extend CMAKE_PREFIX_PATH (see https://cmake.org/cmake/help/v3.8/variable/CMAKE_PREFIX_PATH.html )
set "CMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%"
rem Setup BlockFactory plugins path
Expand All @@ -14,7 +14,7 @@ set BLOCKFACTORY_PLUGIN_PATH=%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\@BLOCKFACTOR
rem Variables to find resources in URDF and SDF files
set "ROS_PACKAGE_PATH=%ROS_PACKAGE_PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share"
set "AMENT_PREFIX_PATH=%AMENT_PREFIX_PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%"
set "GAZEBO_MODEL_PATH=%GAZEBO_MODEL_PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\gazebo\models;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\iCub\robots;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share";%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\ergoCub\robots
set "GAZEBO_MODEL_PATH=%GAZEBO_MODEL_PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\gazebo\models;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\iCub\robots;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share\ergoCub\robots"

rem Bash completion
set "XDG_DATA_DIRS=%XDG_DATA_DIRS%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\share"
Expand All @@ -26,7 +26,7 @@ set "GAZEBO_RESOURCE_PATH=%GAZEBO_RESOURCE_PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_
@endcmakeif ROBOTOLOGY_USES_GAZEBO

@cmakeif ROBOTOLOGY_ENABLE_ROBOT_TESTING
set "PATH=%PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\lib\robottestingframework
set "PATH=%PATH%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\lib\robottestingframework"
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
Expand Down
Loading