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

Jump to bottom

Fix definition of BLOCKFACTORY_PLUGIN_PATH on Windows #599

Merged
merged 6 commits into from
Jan 21, 2021
Merged

Fix definition of BLOCKFACTORY_PLUGIN_PATH on Windows #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3369547
Update setup.sh.in
traversaro Jan 21, 2021
3899561
Update CMakeLists.txt
traversaro Jan 21, 2021
faa829c
Update addPathsToUserEnvVariables.ps1.in
traversaro Jan 21, 2021
f572ff9
Update removePathsFromUserEnvVariables.ps1.in
traversaro Jan 21, 2021
c5bfef9
Update setup.bat.in
traversaro Jan 21, 2021
5f59ad0
Update environment-variables-configuration.md
traversaro Jan 21, 2021
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: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ else()
set(SHLIB_ENV_VAR "LD_LIBRARY_PATH")
endif()

if(WIN32)
set(BLOCKFACTORY_PLUGIN_PATH_DIRECTORY "bin")
else()
set(BLOCKFACTORY_PLUGIN_PATH_DIRECTORY "lib")
endif()

if(WIN32)
# On Git Bash on Windows, C: is rendered as /c
string(REGEX MATCH "^([A-Z])" PROJECT_SOURCE_DIR_DRIVE ${PROJECT_SOURCE_DIR})
Expand Down
2 changes: 1 addition & 1 deletion cmake/template/addPathsToUserEnvVariables.ps1.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Add-ValueToUserEnvVariable YARP_DATA_DIRS $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"
Add-ValueToUserEnvVariable CMAKE_PREFIX_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX;

# Setup the path of blockfactory plugins
Add-ValueToUserEnvVariable BLOCKFACTORY_PLUGIN_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\lib\blockfactory";
Add-ValueToUserEnvVariable BLOCKFACTORY_PLUGIN_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\@BLOCKFACTORY_PLUGIN_PATH_DIRECTORY@\blockfactory";

@cmakeif ROBOTOLOGY_USES_GAZEBO
# ROBOTOLOGY_USES_GAZEBO-specific lines
Expand Down
2 changes: 1 addition & 1 deletion cmake/template/removePathsFromUserEnvVariables.ps1.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Remove-ValueFromUserEnvVariable YARP_DATA_DIRS $ROBOTOLOGY_SUPERBUILD_INSTALL_PR
Remove-ValueFromUserEnvVariable CMAKE_PREFIX_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX;

# Cleanup BLOCKFACTORY_PLUGIN_PATH
Remove-ValueFromUserEnvVariable BLOCKFACTORY_PLUGIN_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\lib\blockfactory";
Remove-ValueFromUserEnvVariable BLOCKFACTORY_PLUGIN_PATH $ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX"\@BLOCKFACTORY_PLUGIN_PATH_DIRECTORY@\blockfactory";

@cmakeif ROBOTOLOGY_USES_GAZEBO
# Cleanup ROBOTOLOGY_USES_GAZEBO-specific lines
Expand Down
2 changes: 1 addition & 1 deletion cmake/template/setup.bat.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set "YARP_DATA_DIRS=%YARP_DATA_DIRS%;%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\shar
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
set BLOCKFACTORY_PLUGIN_PATH=%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\lib\blockfactory
set BLOCKFACTORY_PLUGIN_PATH=%ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX%\@BLOCKFACTORY_PLUGIN_PATH_DIRECTORY@\blockfactory

@cmakeif ROBOTOLOGY_USES_GAZEBO
rem ROBOTOLOGY_USES_GAZEBO-specific lines
Expand Down
2 changes: 1 addition & 1 deletion cmake/template/setup.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH:+${CMAKE_PREFIX_PATH}:}${ROBOTOLOGY
# Extend path for shared libraries (see http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html)
export @SHLIB_ENV_VAR@=${@SHLIB_ENV_VAR@:+${@SHLIB_ENV_VAR@}:}${ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX}/lib
# Setup the path of blockfactory plugins
export BLOCKFACTORY_PLUGIN_PATH=${BLOCKFACTORY_PLUGIN_PATH:+${BLOCKFACTORY_PLUGIN_PATH}:}$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/lib/blockfactory
export BLOCKFACTORY_PLUGIN_PATH=${BLOCKFACTORY_PLUGIN_PATH:+${BLOCKFACTORY_PLUGIN_PATH}:}$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/@BLOCKFACTORY_PLUGIN_PATH_DIRECTORY@/blockfactory

@cmakeif ROBOTOLOGY_USES_GAZEBO
# ROBOTOLOGY_USES_GAZEBO-specific lines
Expand Down
4 changes: 3 additions & 1 deletion doc/environment-variables-configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ For all profile options not listed, no additional configuration is required.
`$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/bin` must be appended to `BLOCKTEST_RESOURCE_PATH` environmental variable.

### Dynamics
`$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/lib/blockfactory` must be appended to the `BLOCKFACTORY_PLUGIN_PATH` environmental variable
`$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/lib/blockfactory` must be appended to the `BLOCKFACTORY_PLUGIN_PATH` environmental variable on Linux and macOS, while
`$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/bin/blockfactory` must be appended to the `BLOCKFACTORY_PLUGIN_PATH` on Windows.


### Human Dynamics
`$ROBOTOLOGY_SUPERBUILD_INSTALL_PREFIX/share/human-gazebo`,
Expand Down