This commit is contained in:
yul
2024-02-04 23:17:28 -08:00
parent 952a86368a
commit 32fdccc843
18 changed files with 182 additions and 85 deletions

View File

@ -12,7 +12,7 @@ try:
from catkin.environment_cache import generate_environment_script
except ImportError:
# search for catkin package in all workspaces and prepend to path
for workspace in '/home/husarion/husarion_ws/devel;/opt/ros/melodic'.split(';'):
for workspace in '/home/husarion/ros_ws/devel;/home/husarion/husarion_ws/devel;/opt/ros/melodic'.split(';'):
python_path = os.path.join(workspace, 'lib/python2.7/dist-packages')
if os.path.isdir(os.path.join(python_path, 'catkin')):
sys.path.insert(0, python_path)

View File

@ -268,7 +268,7 @@ if __name__ == '__main__':
if not args.local:
# environment at generation time
CMAKE_PREFIX_PATH = r'/home/husarion/husarion_ws/devel;/opt/ros/melodic'.split(';')
CMAKE_PREFIX_PATH = r'/home/husarion/ros_ws/devel;/home/husarion/husarion_ws/devel;/opt/ros/melodic'.split(';')
else:
# don't consider any other prefix path than this one
CMAKE_PREFIX_PATH = []

View File

@ -2,4 +2,4 @@
source_root_dir = '/home/husarion/ros_ws/src'
whitelisted_packages = ''.split(';') if '' != '' else []
blacklisted_packages = ''.split(';') if '' != '' else []
underlay_workspaces = '/home/husarion/husarion_ws/devel;/opt/ros/melodic'.split(';') if '/home/husarion/husarion_ws/devel;/opt/ros/melodic' != '' else []
underlay_workspaces = '/home/husarion/ros_ws/devel;/home/husarion/husarion_ws/devel;/opt/ros/melodic'.split(';') if '/home/husarion/ros_ws/devel;/home/husarion/husarion_ws/devel;/opt/ros/melodic' != '' else []

View File

@ -7,8 +7,4 @@
# new environment variables
# modified environment variables
export CMAKE_PREFIX_PATH="/home/husarion/ros_ws/devel:$CMAKE_PREFIX_PATH"
export LD_LIBRARY_PATH="/home/husarion/ros_ws/devel/lib:$LD_LIBRARY_PATH"
export PKG_CONFIG_PATH="/home/husarion/ros_ws/devel/lib/pkgconfig:$PKG_CONFIG_PATH"
export PWD='/home/husarion/ros_ws/build'
export ROS_PACKAGE_PATH="/home/husarion/ros_ws/src:$ROS_PACKAGE_PATH"
export PWD='/home/husarion/ros_ws/build'

View File

@ -268,7 +268,7 @@ if __name__ == '__main__':
if not args.local:
# environment at generation time
CMAKE_PREFIX_PATH = r'/home/husarion/husarion_ws/devel;/opt/ros/melodic'.split(';')
CMAKE_PREFIX_PATH = r'/home/husarion/ros_ws/devel;/home/husarion/husarion_ws/devel;/opt/ros/melodic'.split(';')
else:
# don't consider any other prefix path than this one
CMAKE_PREFIX_PATH = []