Skip to content

Commit

Permalink
Fix #98 (do not ever use deb install-layout) (#99)
Browse files Browse the repository at this point in the history
* Fix #98
  • Loading branch information
Tobias-Fischer committed Apr 14, 2021
1 parent 325b3f8 commit 25f0c62
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 43 deletions.
14 changes: 14 additions & 0 deletions patch/ros-noetic-catkin.patch
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,17 @@ index da5ed7d..5fb71d5 100644
- #message(STATUS "RT_LIBRARY: ${RT_LIBRARY}")
+ set(RT_LIBRARY rt)
endif()
diff --git a/cmake/python.cmake b/cmake/python.cmake
index c72b8599..6b39d3a2 100644
--- a/cmake/python.cmake
+++ b/cmake/python.cmake
@@ -8,9 +8,6 @@ message(STATUS "Using PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}")
set(_PYTHON_PATH_VERSION_SUFFIX "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")

set(enable_setuptools_deb_layout OFF)
-if(EXISTS "/etc/debian_version")
- set(enable_setuptools_deb_layout ON)
-endif()
option(SETUPTOOLS_DEB_LAYOUT "Enable debian style python package layout" ${enable_setuptools_deb_layout})

if(SETUPTOOLS_DEB_LAYOUT)
97 changes: 54 additions & 43 deletions vinca_linux_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,18 @@ conda_index:
build_number: 6

# Ignore all dependencies of selected packages
skip_all_deps: false

######WARNINGWARNING - SET BACK TO FALSE#####
######WARNINGWARNING - SET BACK TO FALSE#####
######WARNINGWARNING - SET BACK TO FALSE#####
skip_all_deps: true

# If full rebuild, the build number of the existing package has
# to match the selected build number for skipping
full_rebuild: true
######WARNINGWARNING - SET BACK TO TRUE#####
######WARNINGWARNING - SET BACK TO TRUE#####
######WARNINGWARNING - SET BACK TO TRUE#####
full_rebuild: false

packages_skip_by_deps:
# - ros_core
Expand All @@ -24,10 +31,13 @@ packages_remove_from_deps:
- stage

skip_existing:
- https://conda.anaconda.org/robostack/
######WARNINGWARNING - SET BACK TO TRUE#####
######WARNINGWARNING - SET BACK TO TRUE#####
######WARNINGWARNING - SET BACK TO TRUE#####
# - https://conda.anaconda.org/robostack/

packages_select_by_deps:
- pybind11_catkin # Needs to be patched to use conda-forge's pybind11
# - pybind11_catkin # Needs to be patched to use conda-forge's pybind11

##
# TODO Linux
Expand All @@ -37,49 +47,50 @@ packages_select_by_deps:
# - swri_image_util
# - exotica_core
# - sesame_ros
- catkin

##
# DONE Linux
##
- rtabmap
- jsk_rqt_plugins
- jsk_common_msgs
- rviz_satellite
- tile_map
- multires_image
- fkie_message_filters
- fkie_potree_rviz_plugin
- fkie_multimaster
- ethercat_grant
- fetch_open_auto_dock
- fetch_tools
- fetch_drivers
- cob_gazebo_tools
- cob_gazebo_worlds
- cob_gazebo_plugins
- cob_gazebo_objects
- dynamic_graph
- dynamic_graph_python
- dynamic_graph_tutorial
- eml
- pose_base_controller
- ur_client_library
- robot_self_filter
- trac_ik
- opencv_apps
- lusb
- image_view2
- ifopt
- explore_lite
- marvelmind_nav
- sob_layer
- soem
- willow_maps
- ypspur_ros
- zbar_ros
- mapviz
- swri_geometry_util
- swri_route_util
# - rtabmap
# - jsk_rqt_plugins
# - jsk_common_msgs
# - rviz_satellite
# - tile_map
# - multires_image
# - fkie_message_filters
# - fkie_potree_rviz_plugin
# - fkie_multimaster
# - ethercat_grant
# - fetch_open_auto_dock
# - fetch_tools
# - fetch_drivers
# - cob_gazebo_tools
# - cob_gazebo_worlds
# - cob_gazebo_plugins
# - cob_gazebo_objects
# - dynamic_graph
# - dynamic_graph_python
# - dynamic_graph_tutorial
# - eml
# - pose_base_controller
# - ur_client_library
# - robot_self_filter
# - trac_ik
# - opencv_apps
# - lusb
# - image_view2
# - ifopt
# - explore_lite
# - marvelmind_nav
# - sob_layer
# - soem
# - willow_maps
# - ypspur_ros
# - zbar_ros
# - mapviz
# - swri_geometry_util
# - swri_route_util
# - tf2_web_republisher
# - fetch_ros
# - spacenav_node
Expand Down

0 comments on commit 25f0c62

Please sign in to comment.