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

Fix gz plugin paths in windows #1899

Merged
merged 1 commit into from
Feb 16, 2023
Merged

Fix gz plugin paths in windows #1899

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions include/ignition/gazebo/config.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#define IGNITION_GAZEBO_SYSTEM_CONFIG_PATH GZ_SIM_SYSTEM_CONFIG_PATH
#define IGNITION_GAZEBO_SERVER_CONFIG_PATH GZ_SIM_SERVER_CONFIG_PATH
#define IGN_GAZEBO_PLUGIN_INSTALL_DIR GZ_SIM_PLUGIN_INSTALL_DIR
#define IGNITION_GAZEBO_PLUGIN_INSTALL_DIR GZ_SIM_PLUGIN_INSTALL_DIR
#define IGN_GAZEBO_GUI_PLUGIN_INSTALL_DIR GZ_SIM_GUI_PLUGIN_INSTALL_DIR
#define IGN_GAZEBO_WORLD_INSTALL_DIR GZ_SIM_WORLD_INSTALL_DIR

Expand Down
4 changes: 2 additions & 2 deletions src/systems/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ function(gz_add_system system_name)
if(WIN32)
# symlinks on Windows require admin priviledges, fallback to copy
INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy
${IGNITION_GAZEBO_PLUGIN_INSTALL_DIR}\/${versioned}
${IGNITION_GAZEBO_PLUGIN_INSTALL_DIR}\/${unversioned})")
${GZ_SIM_PLUGIN_INSTALL_DIR}\/${versioned}
${GZ_SIM_PLUGIN_INSTALL_DIR}\/${unversioned})")
else()
file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${versioned} ${unversioned} WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
Expand Down