add fcl to osx and win (#106)

* add fcl to osx and win * Fix spacing Co-authored-by: Tobias Fischer <[email protected]>
RoboStack · May 7, 2021 · 816f21e · 816f21e
1 parent b6ee849
commit 816f21e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/patch/ros-noetic-fcl.patch b/patch/ros-noetic-fcl.patch
@@ -5,13 +5,13 @@ index 6e5bbb8..e69df39 100644
 @@ -378,9 +378,9 @@ if(NOT FCL_BUILD_TESTS STREQUAL "DEFAULT")
    unset(_BUILD_TESTING)
  endif()
-
+ 
 -if(BUILD_TESTING AND NOT FCL_HIDE_ALL_SYMBOLS)
 -    add_subdirectory(test)
 -endif()
 +# if(BUILD_TESTING AND NOT FCL_HIDE_ALL_SYMBOLS)
 +#     add_subdirectory(test)
 +# endif()
-
+ 
  #===============================================================================
  # API documentation using Doxygen
diff --git a/vinca_linux_aarch64.yaml b/vinca_linux_aarch64.yaml
@@ -28,6 +28,7 @@ skip_existing:
 
 packages_select_by_deps:
   # # TODO
+  - fcl
   - ros_numpy
   - eigenpy
   - catkin

diff --git a/vinca_osx.yaml b/vinca_osx.yaml
@@ -30,6 +30,7 @@ packages_select_by_deps:
   ##
   #  TODO OSX
   ##
+  - fcl
   # - grid_map  # fails with tbb-error, probably need to use cmake instead of pkg-config. See grid-map-osx branch
   # - pybind11_catkin  # need to be unvendored
 

diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -29,9 +29,8 @@ skip_existing:
   - https://conda.anaconda.org/robostack/
 
 packages_select_by_deps:
+  - fcl
   # - pybind11_catkin  # need to be unvendored
-  # - ros_numpy
-  # - eigenpy
 
   ##
   # DONE Win
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ skip_existing: @@
     packages_select_by_deps:
       # # TODO
+      - fcl
       - ros_numpy
       - eigenpy
       - catkin
@@ Expand Down @@