diff --git a/math/hpp-pinocchio/Makefile b/math/hpp-pinocchio/Makefile index 7bbdfa309..4df6e692a 100644 --- a/math/hpp-pinocchio/Makefile +++ b/math/hpp-pinocchio/Makefile @@ -2,17 +2,18 @@ # Created: Guilhem Saurel on Wed, 14 Mar 2018 # -HPP_PACKAGE= hpp-pinocchio -HPP_COMMENT= Wrapping of the kinematic/dynamic chain Pinocchio for HPP. +PKGREVISION= 1 +HPP_PACKAGE= hpp-pinocchio +HPP_COMMENT= Wrapping of the kinematic/dynamic chain Pinocchio for HPP -CATEGORIES= math +CATEGORIES= math include ../../meta-pkgs/hpp/Makefile.common include ../../mapping/octomap/depend.mk include ../../math/eigen3/depend.mk include ../../math/pinocchio/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../path/hpp-util/depend.mk include ../../simulation/hpp-environments/depend.mk include ../../robots/example-robot-data/depend.mk diff --git a/math/hpp-pinocchio/depend.mk b/math/hpp-pinocchio/depend.mk index 653b7a0cf..d97c4c05f 100644 --- a/math/hpp-pinocchio/depend.mk +++ b/math/hpp-pinocchio/depend.mk @@ -29,7 +29,7 @@ SYSTEM_SEARCH.hpp-pinocchio= \ DEPEND_ABI.eigen3 += eigen3>=3.2.92 include ../../math/eigen3/depend.mk include ../../math/pinocchio/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk endif # HPP_PINOCCHIO_DEPEND_MK --------------------------------- diff --git a/math/pinocchio/Makefile b/math/pinocchio/Makefile index ecd5fdf03..01d391dcf 100644 --- a/math/pinocchio/Makefile +++ b/math/pinocchio/Makefile @@ -2,6 +2,7 @@ # Created: Olivier Stasse on Thu, 4 Feb 2016 # +PKGREVISION= 1 ORG= stack-of-tasks NAME= pinocchio VERSION= 3.2.0 @@ -36,7 +37,7 @@ endif include ../../graphics/urdfdom/depend.mk include ../../math/eigen3/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../mapping/octomap/depend.mk include ../../optimization/casadi/depend.mk include ../../pkgtools/pkg-config/depend.mk diff --git a/math/pinocchio/depend.mk b/math/pinocchio/depend.mk index c77c917fc..e88cf0708 100644 --- a/math/pinocchio/depend.mk +++ b/math/pinocchio/depend.mk @@ -32,4 +32,4 @@ DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} # pulled by the package public headers include ../../graphics/urdfdom/depend.mk include ../../math/eigen3/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk diff --git a/math/py-pinocchio/Makefile b/math/py-pinocchio/Makefile index ddf84cdd2..04530e1f1 100644 --- a/math/py-pinocchio/Makefile +++ b/math/py-pinocchio/Makefile @@ -2,6 +2,7 @@ # Created: Olivier Stasse on Thu, 4 Feb 2016 # +PKGREVISION= 1 ORG= stack-of-tasks NAME= pinocchio VERSION= 3.2.0 @@ -43,8 +44,8 @@ endif include ../../math/pinocchio/depend.mk include ../../math/py-eigenpy/depend.mk -include ../../path/hpp-fcl/depend.mk -include ../../path/py-hpp-fcl/depend.mk +include ../../path/coal/depend.mk +include ../../path/py-coal/depend.mk include ../../mapping/octomap/depend.mk include ../../optimization/py-casadi/depend.mk include ../../pkgtools/pkg-config/depend.mk diff --git a/optimization/py-crocoddyl/Makefile b/optimization/py-crocoddyl/Makefile index e3bea09da..8328e3078 100644 --- a/optimization/py-crocoddyl/Makefile +++ b/optimization/py-crocoddyl/Makefile @@ -2,6 +2,7 @@ # Created: Guilhem Saurel on Tue, 14 Apr 2020 # +PKGREVISION= 1 ORG= loco-3d NAME= crocoddyl VERSION= 2.1.0 @@ -29,7 +30,7 @@ include ../../math/pinocchio/depend.mk include ../../math/py-eigenpy/depend.mk include ../../math/py-pinocchio/depend.mk include ../../optimization/ipopt/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../pkgtools/pkg-config/depend.mk include ../../robots/example-robot-data/depend.mk include ../../robots/py-example-robot-data/depend.mk diff --git a/optimization/py-tsid/Makefile b/optimization/py-tsid/Makefile index 3a841a5d0..19ef719e4 100644 --- a/optimization/py-tsid/Makefile +++ b/optimization/py-tsid/Makefile @@ -2,6 +2,7 @@ # Created: Guilhem Saurel on Tue, 14 Apr 2020 # +PKGREVISION= 1 ORG= stack-of-tasks NAME= tsid VERSION= 1.7.1 @@ -26,7 +27,7 @@ include ../../math/pinocchio/depend.mk include ../../math/py-eigenpy/depend.mk include ../../math/py-pinocchio/depend.mk include ../../optimization/tsid/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../mk/sysdep/boost-headers.mk include ../../mk/sysdep/boost-libs.mk include ../../mk/sysdep/cmake.mk diff --git a/optimization/tsid/Makefile b/optimization/tsid/Makefile index cd624c4a1..9305b0440 100644 --- a/optimization/tsid/Makefile +++ b/optimization/tsid/Makefile @@ -2,6 +2,7 @@ # Created: Justin Carpentier on Tue, 14 Apr 2020 # +PKGREVISION= 1 ORG= stack-of-tasks NAME= tsid VERSION= 1.7.1 @@ -20,7 +21,7 @@ include ../../mapping/octomap/depend.mk include ../../math/eigen3/depend.mk include ../../math/eiquadprog/depend.mk include ../../math/pinocchio/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../mk/sysdep/boost-headers.mk include ../../mk/sysdep/boost-libs.mk include ../../mk/sysdep/cmake.mk diff --git a/path/Makefile b/path/Makefile index fc6b343d9..0de14325b 100644 --- a/path/Makefile +++ b/path/Makefile @@ -6,10 +6,10 @@ COMMENT= Path planning algorithms and tools SUBDIR+= aspect-genom +SUBDIR+= coal SUBDIR+= hpp-affordance SUBDIR+= hpp-constraints SUBDIR+= hpp-core -SUBDIR+= hpp-fcl SUBDIR+= hpp-manipulation SUBDIR+= hpp-manipulation-urdf SUBDIR+= hpp-statistics @@ -20,11 +20,11 @@ SUBDIR+= libp3d SUBDIR+= maneuver-genom3 SUBDIR+= ndd-genom SUBDIR+= p3d-genom +SUBDIR+= py-coal SUBDIR+= py-hpp-affordance-corba SUBDIR+= py-hpp-bezier-com-traj SUBDIR+= py-hpp-centroidal-dynamics SUBDIR+= py-hpp-corbaserver -SUBDIR+= py-hpp-fcl SUBDIR+= py-hpp-manipulation-corba include ../mk/robotpkg.subdir.mk diff --git a/path/hpp-fcl/DESCR b/path/coal/DESCR similarity index 100% rename from path/hpp-fcl/DESCR rename to path/coal/DESCR diff --git a/path/hpp-fcl/Makefile b/path/coal/Makefile similarity index 71% rename from path/hpp-fcl/Makefile rename to path/coal/Makefile index e5fed9eae..899ec29ed 100644 --- a/path/hpp-fcl/Makefile +++ b/path/coal/Makefile @@ -1,25 +1,25 @@ -# robotpkg Makefile for: path/hpp-fcl +# robotpkg Makefile for: path/coal # Created: Florent Lamiraux on Sat, 7 Mar 2015 # -HPP_PACKAGE= hpp-fcl -HPP_VERSION= 2.4.5 +ORG= coal-library +NAME= coal +VERSION= 3.0.0 CATEGORIES= path -HPP_COMMENT= collision detection and distance computations +COMMENT= collision detection and distance computations LICENSE= 2-clause-bsd - -CONFLICTS+= hpp-fcl04-[0-9]* - -include ../../meta-pkgs/hpp/Makefile.common +CONFLICTS+= hpp-fcl-[0-9]* USE_BOOST_LIBS= thread date_time system filesystem unit_test_framework chrono +USE_MASTER_GITHUB= true # boost-1.47.0 has -Wconversion warnings in date_time/posix_time/posix_time.hpp CMAKE_ARGS+= -DCXX_DISABLE_WERROR=yes CMAKE_ARGS+= -DBUILD_PYTHON_INTERFACE=OFF +CMAKE_ARGS+= -DCOAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL=ON -DEPEND_ABI.cmake+= cmake>=3.10 +include ../../devel/jrl-cmakemodules/Makefile.common include ../../mk/robotpkg.prefs.mk ifeq (,$(filter Ubuntu-16.04 Debian-9,${OPSYS}-${OS_VERSION})) @@ -34,6 +34,7 @@ include ../../math/eigen3/depend.mk include ../../mk/sysdep/assimp.mk include ../../mk/sysdep/boost-headers.mk include ../../mk/sysdep/boost-libs.mk +include ../../mk/sysdep/cmake.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk include ../../mk/robotpkg.mk diff --git a/path/coal/PLIST b/path/coal/PLIST new file mode 100644 index 000000000..b98d3d672 --- /dev/null +++ b/path/coal/PLIST @@ -0,0 +1,263 @@ +@comment Thu Nov 21 10:48:15 CET 2024 +include/coal/BV/AABB.h +include/coal/BV/BV.h +include/coal/BV/BV_node.h +include/coal/BV/OBB.h +include/coal/BV/OBBRSS.h +include/coal/BV/RSS.h +include/coal/BV/kDOP.h +include/coal/BV/kIOS.h +include/coal/BVH/BVH_front.h +include/coal/BVH/BVH_internal.h +include/coal/BVH/BVH_model.h +include/coal/BVH/BVH_utility.h +include/coal/broadphase/broadphase.h +include/coal/broadphase/broadphase_SSaP.h +include/coal/broadphase/broadphase_SaP.h +include/coal/broadphase/broadphase_bruteforce.h +include/coal/broadphase/broadphase_callbacks.h +include/coal/broadphase/broadphase_collision_manager.h +include/coal/broadphase/broadphase_continuous_collision_manager-inl.h +include/coal/broadphase/broadphase_continuous_collision_manager.h +include/coal/broadphase/broadphase_dynamic_AABB_tree-inl.h +include/coal/broadphase/broadphase_dynamic_AABB_tree.h +include/coal/broadphase/broadphase_dynamic_AABB_tree_array-inl.h +include/coal/broadphase/broadphase_dynamic_AABB_tree_array.h +include/coal/broadphase/broadphase_interval_tree.h +include/coal/broadphase/broadphase_spatialhash-inl.h +include/coal/broadphase/broadphase_spatialhash.h +include/coal/broadphase/default_broadphase_callbacks.h +include/coal/broadphase/detail/hierarchy_tree-inl.h +include/coal/broadphase/detail/hierarchy_tree.h +include/coal/broadphase/detail/hierarchy_tree_array-inl.h +include/coal/broadphase/detail/hierarchy_tree_array.h +include/coal/broadphase/detail/interval_tree.h +include/coal/broadphase/detail/interval_tree_node.h +include/coal/broadphase/detail/morton-inl.h +include/coal/broadphase/detail/morton.h +include/coal/broadphase/detail/node_base-inl.h +include/coal/broadphase/detail/node_base.h +include/coal/broadphase/detail/node_base_array-inl.h +include/coal/broadphase/detail/node_base_array.h +include/coal/broadphase/detail/simple_hash_table-inl.h +include/coal/broadphase/detail/simple_hash_table.h +include/coal/broadphase/detail/simple_interval-inl.h +include/coal/broadphase/detail/simple_interval.h +include/coal/broadphase/detail/sparse_hash_table-inl.h +include/coal/broadphase/detail/sparse_hash_table.h +include/coal/broadphase/detail/spatial_hash-inl.h +include/coal/broadphase/detail/spatial_hash.h +include/coal/collision.h +include/coal/collision_data.h +include/coal/collision_func_matrix.h +include/coal/collision_object.h +include/coal/collision_utility.h +include/coal/config.hh +include/coal/contact_patch.h +include/coal/contact_patch/contact_patch_solver.h +include/coal/contact_patch/contact_patch_solver.hxx +include/coal/contact_patch_func_matrix.h +include/coal/data_types.h +include/coal/deprecated.hh +include/coal/distance.h +include/coal/distance_func_matrix.h +include/coal/fwd.hh +include/coal/hfield.h +include/coal/internal/BV_fitter.h +include/coal/internal/BV_splitter.h +include/coal/internal/intersect.h +include/coal/internal/shape_shape_contact_patch_func.h +include/coal/internal/shape_shape_func.h +include/coal/internal/tools.h +include/coal/internal/traversal.h +include/coal/internal/traversal_node_base.h +include/coal/internal/traversal_node_bvh_shape.h +include/coal/internal/traversal_node_bvhs.h +include/coal/internal/traversal_node_hfield_shape.h +include/coal/internal/traversal_node_octree.h +include/coal/internal/traversal_node_setup.h +include/coal/internal/traversal_node_shapes.h +include/coal/internal/traversal_recurse.h +include/coal/logging.h +include/coal/math/matrix_3f.h +include/coal/math/transform.h +include/coal/math/types.h +include/coal/math/vec_3f.h +include/coal/mesh_loader/assimp.h +include/coal/mesh_loader/loader.h +include/coal/narrowphase/gjk.h +include/coal/narrowphase/minkowski_difference.h +include/coal/narrowphase/narrowphase.h +include/coal/narrowphase/narrowphase_defaults.h +include/coal/narrowphase/support_functions.h +include/coal/octree.h +include/coal/serialization/AABB.h +include/coal/serialization/BVH_model.h +include/coal/serialization/BV_node.h +include/coal/serialization/BV_splitter.h +include/coal/serialization/OBB.h +include/coal/serialization/OBBRSS.h +include/coal/serialization/RSS.h +include/coal/serialization/archive.h +include/coal/serialization/collision_data.h +include/coal/serialization/collision_object.h +include/coal/serialization/contact_patch.h +include/coal/serialization/convex.h +include/coal/serialization/eigen.h +include/coal/serialization/fwd.h +include/coal/serialization/geometric_shapes.h +include/coal/serialization/hfield.h +include/coal/serialization/kDOP.h +include/coal/serialization/kIOS.h +include/coal/serialization/memory.h +include/coal/serialization/octree.h +include/coal/serialization/quadrilateral.h +include/coal/serialization/serializer.h +include/coal/serialization/transform.h +include/coal/serialization/triangle.h +include/coal/shape/convex.h +include/coal/shape/details/convex.hxx +include/coal/shape/geometric_shape_to_BVH_model.h +include/coal/shape/geometric_shapes.h +include/coal/shape/geometric_shapes_traits.h +include/coal/shape/geometric_shapes_utility.h +include/coal/timings.h +include/coal/warning.hh +include/hpp/fcl/BV/AABB.h +include/hpp/fcl/BV/BV.h +include/hpp/fcl/BV/BV_node.h +include/hpp/fcl/BV/OBB.h +include/hpp/fcl/BV/OBBRSS.h +include/hpp/fcl/BV/RSS.h +include/hpp/fcl/BV/kDOP.h +include/hpp/fcl/BV/kIOS.h +include/hpp/fcl/BVH/BVH_front.h +include/hpp/fcl/BVH/BVH_internal.h +include/hpp/fcl/BVH/BVH_model.h +include/hpp/fcl/BVH/BVH_utility.h +include/hpp/fcl/broadphase/broadphase.h +include/hpp/fcl/broadphase/broadphase_SSaP.h +include/hpp/fcl/broadphase/broadphase_SaP.h +include/hpp/fcl/broadphase/broadphase_bruteforce.h +include/hpp/fcl/broadphase/broadphase_callbacks.h +include/hpp/fcl/broadphase/broadphase_collision_manager.h +include/hpp/fcl/broadphase/broadphase_continuous_collision_manager-inl.h +include/hpp/fcl/broadphase/broadphase_continuous_collision_manager.h +include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree-inl.h +include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h +include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array-inl.h +include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h +include/hpp/fcl/broadphase/broadphase_interval_tree.h +include/hpp/fcl/broadphase/broadphase_spatialhash-inl.h +include/hpp/fcl/broadphase/broadphase_spatialhash.h +include/hpp/fcl/broadphase/default_broadphase_callbacks.h +include/hpp/fcl/broadphase/detail/hierarchy_tree-inl.h +include/hpp/fcl/broadphase/detail/hierarchy_tree.h +include/hpp/fcl/broadphase/detail/hierarchy_tree_array-inl.h +include/hpp/fcl/broadphase/detail/hierarchy_tree_array.h +include/hpp/fcl/broadphase/detail/interval_tree.h +include/hpp/fcl/broadphase/detail/interval_tree_node.h +include/hpp/fcl/broadphase/detail/morton-inl.h +include/hpp/fcl/broadphase/detail/morton.h +include/hpp/fcl/broadphase/detail/node_base-inl.h +include/hpp/fcl/broadphase/detail/node_base.h +include/hpp/fcl/broadphase/detail/node_base_array-inl.h +include/hpp/fcl/broadphase/detail/node_base_array.h +include/hpp/fcl/broadphase/detail/simple_hash_table-inl.h +include/hpp/fcl/broadphase/detail/simple_hash_table.h +include/hpp/fcl/broadphase/detail/simple_interval-inl.h +include/hpp/fcl/broadphase/detail/simple_interval.h +include/hpp/fcl/broadphase/detail/sparse_hash_table-inl.h +include/hpp/fcl/broadphase/detail/sparse_hash_table.h +include/hpp/fcl/broadphase/detail/spatial_hash-inl.h +include/hpp/fcl/broadphase/detail/spatial_hash.h +include/hpp/fcl/coal.hpp +include/hpp/fcl/collision.h +include/hpp/fcl/collision_data.h +include/hpp/fcl/collision_func_matrix.h +include/hpp/fcl/collision_object.h +include/hpp/fcl/collision_utility.h +include/hpp/fcl/config.hh +include/hpp/fcl/contact_patch.h +include/hpp/fcl/contact_patch/contact_patch_solver.h +include/hpp/fcl/contact_patch/contact_patch_solver.hxx +include/hpp/fcl/contact_patch_func_matrix.h +include/hpp/fcl/data_types.h +include/hpp/fcl/deprecated.hh +include/hpp/fcl/distance.h +include/hpp/fcl/distance_func_matrix.h +include/hpp/fcl/fwd.hh +include/hpp/fcl/hfield.h +include/hpp/fcl/internal/BV_fitter.h +include/hpp/fcl/internal/BV_splitter.h +include/hpp/fcl/internal/intersect.h +include/hpp/fcl/internal/shape_shape_contact_patch_func.h +include/hpp/fcl/internal/shape_shape_func.h +include/hpp/fcl/internal/tools.h +include/hpp/fcl/internal/traversal.h +include/hpp/fcl/internal/traversal_node_base.h +include/hpp/fcl/internal/traversal_node_bvh_shape.h +include/hpp/fcl/internal/traversal_node_bvhs.h +include/hpp/fcl/internal/traversal_node_hfield_shape.h +include/hpp/fcl/internal/traversal_node_octree.h +include/hpp/fcl/internal/traversal_node_setup.h +include/hpp/fcl/internal/traversal_node_shapes.h +include/hpp/fcl/internal/traversal_recurse.h +include/hpp/fcl/logging.h +include/hpp/fcl/math/matrix_3f.h +include/hpp/fcl/math/transform.h +include/hpp/fcl/math/types.h +include/hpp/fcl/math/vec_3f.h +include/hpp/fcl/mesh_loader/assimp.h +include/hpp/fcl/mesh_loader/loader.h +include/hpp/fcl/narrowphase/gjk.h +include/hpp/fcl/narrowphase/minkowski_difference.h +include/hpp/fcl/narrowphase/narrowphase.h +include/hpp/fcl/narrowphase/narrowphase_defaults.h +include/hpp/fcl/narrowphase/support_functions.h +include/hpp/fcl/octree.h +include/hpp/fcl/serialization/AABB.h +include/hpp/fcl/serialization/BVH_model.h +include/hpp/fcl/serialization/BV_node.h +include/hpp/fcl/serialization/BV_splitter.h +include/hpp/fcl/serialization/OBB.h +include/hpp/fcl/serialization/OBBRSS.h +include/hpp/fcl/serialization/RSS.h +include/hpp/fcl/serialization/archive.h +include/hpp/fcl/serialization/collision_data.h +include/hpp/fcl/serialization/collision_object.h +include/hpp/fcl/serialization/contact_patch.h +include/hpp/fcl/serialization/convex.h +include/hpp/fcl/serialization/eigen.h +include/hpp/fcl/serialization/fwd.h +include/hpp/fcl/serialization/geometric_shapes.h +include/hpp/fcl/serialization/hfield.h +include/hpp/fcl/serialization/kDOP.h +include/hpp/fcl/serialization/kIOS.h +include/hpp/fcl/serialization/memory.h +include/hpp/fcl/serialization/octree.h +include/hpp/fcl/serialization/quadrilateral.h +include/hpp/fcl/serialization/serializer.h +include/hpp/fcl/serialization/transform.h +include/hpp/fcl/serialization/triangle.h +include/hpp/fcl/shape/convex.h +include/hpp/fcl/shape/details/convex.hxx +include/hpp/fcl/shape/geometric_shape_to_BVH_model.h +include/hpp/fcl/shape/geometric_shapes.h +include/hpp/fcl/shape/geometric_shapes_traits.h +include/hpp/fcl/shape/geometric_shapes_utility.h +include/hpp/fcl/timings.h +include/hpp/fcl/warning.hh +lib/cmake/coal/coalConfig.cmake +lib/cmake/coal/coalConfigVersion.cmake +lib/cmake/coal/coalTargets-release.cmake +lib/cmake/coal/coalTargets.cmake +lib/cmake/coal/cxx-standard.cmake +lib/cmake/hpp-fcl/hpp-fclConfig.cmake +lib/cmake/hpp-fcl/hpp-fclConfigVersion.cmake +lib/libcoal.so +lib/pkgconfig/coal.pc +share/ament_index/resource_index/packages/coal +share/coal/hook/ament_prefix_path.dsv +share/coal/hook/python_path.dsv +share/coal/package.xml diff --git a/path/coal/depend.mk b/path/coal/depend.mk new file mode 100644 index 000000000..62d504376 --- /dev/null +++ b/path/coal/depend.mk @@ -0,0 +1,32 @@ +# robotpkg depend.mk for: path/coal +# Created: Florent Lamiraux on Sat, 7 Mar 2015 +# + +DEPEND_DEPTH:= ${DEPEND_DEPTH}+ +COAL_DEPEND_MK:= ${COAL_DEPEND_MK}+ + +ifeq (+,$(DEPEND_DEPTH)) +DEPEND_PKG+= coal +endif + +ifeq (+,$(COAL_DEPEND_MK)) # -------------------------------------------- + +PREFER.coal?= robotpkg + +DEPEND_USE+= coal + +DEPEND_ABI.coal?= coal>=3 +DEPEND_DIR.coal?= ../../path/coal + +SYSTEM_SEARCH.coal=\ + 'include/coal/config.hh:/COAL_VERSION /s/[^0-9.]//gp' \ + 'lib/cmake/coal/coalConfigVersion.cmake:/PACKAGE_VERSION /s/[^0-9.]//gp' \ + 'lib/libcoal.so' \ + 'lib/pkgconfig/coal.pc:/Version/s/[^0-9.]//gp' \ + 'share/coal/package.xml://s/[^0-9.]//gp' + +include ../../math/eigen3/depend.mk + +endif # COAL_DEPEND_MK -------------------------------------------------- + +DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/path/coal/distinfo b/path/coal/distinfo new file mode 100644 index 000000000..03d280d30 --- /dev/null +++ b/path/coal/distinfo @@ -0,0 +1,3 @@ +SHA1 (coal-3.0.0.tar.gz) = becfa6e23e422ebd25287cbeea393e7efa639ec9 +RMD160 (coal-3.0.0.tar.gz) = 842216d6e152ff00788e1d27acbdc95f0e6cc8a0 +Size (coal-3.0.0.tar.gz) = 3400535 bytes diff --git a/path/hpp-affordance/Makefile b/path/hpp-affordance/Makefile index e1768d2cb..b76fb451c 100644 --- a/path/hpp-affordance/Makefile +++ b/path/hpp-affordance/Makefile @@ -2,20 +2,19 @@ # Created: Guilhem Saurel on Tue, 13 Apr 2021 # -HPP_PACKAGE= hpp-affordance -HPP_COMMENT= Extract Whole-Body Affordances for Mutli-Contact Planning. +PKGREVISION= 1 +HPP_PACKAGE= hpp-affordance +HPP_COMMENT= Extract Whole-Body Affordances for Mutli-Contact Planning -CATEGORIES= path +CATEGORIES= path include ../../meta-pkgs/hpp/Makefile.common -include ../../mk/sysdep/boost-headers.mk -include ../../mk/sysdep/boost-libs.mk - include ../../math/eigen3/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../mapping/octomap/depend.mk - +include ../../mk/sysdep/boost-headers.mk +include ../../mk/sysdep/boost-libs.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk include ../../mk/robotpkg.mk diff --git a/path/hpp-constraints/Makefile b/path/hpp-constraints/Makefile index d65942afa..9131a984a 100644 --- a/path/hpp-constraints/Makefile +++ b/path/hpp-constraints/Makefile @@ -2,6 +2,7 @@ # Created: Antonio El Khoury on Thu, 26 Sep 2013 # +PKGREVISION= 1 HPP_PACKAGE= hpp-constraints HPP_COMMENT= Define non-linear constraints on robot configurations @@ -19,7 +20,7 @@ include ../../math/eigen3/depend.mk include ../../math/hpp-pinocchio/depend.mk include ../../math/pinocchio/depend.mk include ../../optimization/qpoases/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../path/hpp-statistics/depend.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk diff --git a/path/hpp-fcl/PLIST b/path/hpp-fcl/PLIST deleted file mode 100644 index 1944f1a57..000000000 --- a/path/hpp-fcl/PLIST +++ /dev/null @@ -1,120 +0,0 @@ -@comment Thu May 31 16:47:36 CEST 2018 -include/hpp/fcl/BV/AABB.h -include/hpp/fcl/BV/BV.h -include/hpp/fcl/BV/BV_node.h -include/hpp/fcl/BV/OBB.h -include/hpp/fcl/BV/OBBRSS.h -include/hpp/fcl/BV/RSS.h -include/hpp/fcl/BV/kDOP.h -include/hpp/fcl/BV/kIOS.h -include/hpp/fcl/BVH/BVH_front.h -include/hpp/fcl/BVH/BVH_internal.h -include/hpp/fcl/BVH/BVH_model.h -include/hpp/fcl/BVH/BVH_utility.h -include/hpp/fcl/broadphase/broadphase.h -include/hpp/fcl/broadphase/broadphase_SSaP.h -include/hpp/fcl/broadphase/broadphase_SaP.h -include/hpp/fcl/broadphase/broadphase_bruteforce.h -include/hpp/fcl/broadphase/broadphase_callbacks.h -include/hpp/fcl/broadphase/broadphase_collision_manager.h -include/hpp/fcl/broadphase/broadphase_continuous_collision_manager-inl.h -include/hpp/fcl/broadphase/broadphase_continuous_collision_manager.h -include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree-inl.h -include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree.h -include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array-inl.h -include/hpp/fcl/broadphase/broadphase_dynamic_AABB_tree_array.h -include/hpp/fcl/broadphase/broadphase_interval_tree.h -include/hpp/fcl/broadphase/broadphase_spatialhash-inl.h -include/hpp/fcl/broadphase/broadphase_spatialhash.h -include/hpp/fcl/broadphase/default_broadphase_callbacks.h -include/hpp/fcl/broadphase/detail/hierarchy_tree-inl.h -include/hpp/fcl/broadphase/detail/hierarchy_tree.h -include/hpp/fcl/broadphase/detail/hierarchy_tree_array-inl.h -include/hpp/fcl/broadphase/detail/hierarchy_tree_array.h -include/hpp/fcl/broadphase/detail/interval_tree.h -include/hpp/fcl/broadphase/detail/interval_tree_node.h -include/hpp/fcl/broadphase/detail/morton-inl.h -include/hpp/fcl/broadphase/detail/morton.h -include/hpp/fcl/broadphase/detail/node_base-inl.h -include/hpp/fcl/broadphase/detail/node_base.h -include/hpp/fcl/broadphase/detail/node_base_array-inl.h -include/hpp/fcl/broadphase/detail/node_base_array.h -include/hpp/fcl/broadphase/detail/simple_hash_table-inl.h -include/hpp/fcl/broadphase/detail/simple_hash_table.h -include/hpp/fcl/broadphase/detail/simple_interval-inl.h -include/hpp/fcl/broadphase/detail/simple_interval.h -include/hpp/fcl/broadphase/detail/sparse_hash_table-inl.h -include/hpp/fcl/broadphase/detail/sparse_hash_table.h -include/hpp/fcl/broadphase/detail/spatial_hash-inl.h -include/hpp/fcl/broadphase/detail/spatial_hash.h -include/hpp/fcl/collision.h -include/hpp/fcl/collision_data.h -include/hpp/fcl/collision_func_matrix.h -include/hpp/fcl/collision_object.h -include/hpp/fcl/collision_utility.h -include/hpp/fcl/config.hh -include/hpp/fcl/data_types.h -include/hpp/fcl/deprecated.hh -include/hpp/fcl/distance.h -include/hpp/fcl/distance_func_matrix.h -include/hpp/fcl/fwd.hh -include/hpp/fcl/hfield.h -include/hpp/fcl/internal/BV_fitter.h -include/hpp/fcl/internal/BV_splitter.h -include/hpp/fcl/internal/intersect.h -include/hpp/fcl/internal/shape_shape_func.h -include/hpp/fcl/internal/tools.h -include/hpp/fcl/internal/traversal.h -include/hpp/fcl/internal/traversal_node_base.h -include/hpp/fcl/internal/traversal_node_bvh_shape.h -include/hpp/fcl/internal/traversal_node_bvhs.h -include/hpp/fcl/internal/traversal_node_hfield_shape.h -include/hpp/fcl/internal/traversal_node_octree.h -include/hpp/fcl/internal/traversal_node_setup.h -include/hpp/fcl/internal/traversal_node_shapes.h -include/hpp/fcl/internal/traversal_recurse.h -include/hpp/fcl/math/matrix_3f.h -include/hpp/fcl/math/transform.h -include/hpp/fcl/math/types.h -include/hpp/fcl/math/vec_3f.h -include/hpp/fcl/mesh_loader/assimp.h -include/hpp/fcl/mesh_loader/loader.h -include/hpp/fcl/narrowphase/gjk.h -include/hpp/fcl/narrowphase/narrowphase.h -include/hpp/fcl/octree.h -include/hpp/fcl/serialization/AABB.h -include/hpp/fcl/serialization/BVH_model.h -include/hpp/fcl/serialization/BV_node.h -include/hpp/fcl/serialization/BV_splitter.h -include/hpp/fcl/serialization/OBB.h -include/hpp/fcl/serialization/OBBRSS.h -include/hpp/fcl/serialization/RSS.h -include/hpp/fcl/serialization/collision_data.h -include/hpp/fcl/serialization/collision_object.h -include/hpp/fcl/serialization/convex.h -include/hpp/fcl/serialization/eigen.h -include/hpp/fcl/serialization/fwd.h -include/hpp/fcl/serialization/geometric_shapes.h -include/hpp/fcl/serialization/hfield.h -include/hpp/fcl/serialization/memory.h -include/hpp/fcl/serialization/quadrilateral.h -include/hpp/fcl/serialization/triangle.h -include/hpp/fcl/shape/convex.h -include/hpp/fcl/shape/details/convex.hxx -include/hpp/fcl/shape/geometric_shape_to_BVH_model.h -include/hpp/fcl/shape/geometric_shapes.h -include/hpp/fcl/shape/geometric_shapes_traits.h -include/hpp/fcl/shape/geometric_shapes_utility.h -include/hpp/fcl/timings.h -include/hpp/fcl/warning.hh -lib/cmake/hpp-fcl/cxx-standard.cmake -lib/cmake/hpp-fcl/hpp-fclConfig.cmake -lib/cmake/hpp-fcl/hpp-fclConfigVersion.cmake -lib/cmake/hpp-fcl/hpp-fclTargets-release.cmake -lib/cmake/hpp-fcl/hpp-fclTargets.cmake -lib/libhpp-fcl.so -lib/pkgconfig/hpp-fcl.pc -share/ament_index/resource_index/packages/hpp-fcl -share/hpp-fcl/hook/ament_prefix_path.dsv -share/hpp-fcl/hook/python_path.dsv -share/hpp-fcl/package.xml diff --git a/path/hpp-fcl/depend.mk b/path/hpp-fcl/depend.mk deleted file mode 100644 index 1542a1511..000000000 --- a/path/hpp-fcl/depend.mk +++ /dev/null @@ -1,32 +0,0 @@ -# robotpkg depend.mk for: path/hpp-fcl -# Created: Florent Lamiraux on Sat, 7 Mar 2015 -# - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -HPP_FCL_DEPEND_MK:= ${HPP_FCL_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= hpp-fcl -endif - -ifeq (+,$(HPP_FCL_DEPEND_MK)) # -------------------------------------------- - -PREFER.hpp-fcl?= robotpkg - -DEPEND_USE+= hpp-fcl - -DEPEND_ABI.hpp-fcl?= hpp-fcl>=1.4 -DEPEND_DIR.hpp-fcl?= ../../path/hpp-fcl - -SYSTEM_SEARCH.hpp-fcl=\ - 'include/hpp/fcl/config.hh:/HPP_FCL_VERSION /s/[^0-9.]//gp' \ - 'lib/cmake/hpp-fcl/hpp-fclConfigVersion.cmake:/PACKAGE_VERSION /s/[^0-9.]//gp' \ - 'lib/libhpp-fcl.so' \ - 'lib/pkgconfig/hpp-fcl.pc:/Version/s/[^0-9.]//gp' \ - 'share/hpp-fcl/package.xml://s/[^0-9.]//gp' - -include ../../math/eigen3/depend.mk - -endif # HPP_FCL_DEPEND_MK -------------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/path/hpp-fcl/distinfo b/path/hpp-fcl/distinfo deleted file mode 100644 index cdd8475ae..000000000 --- a/path/hpp-fcl/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA1 (hpp-fcl-2.4.5.tar.gz) = 96fb20cca5dcd2623f4977503cd541e1bc10a751 -RMD160 (hpp-fcl-2.4.5.tar.gz) = a4a81a2a2ce4778b9efeacc17c28ef1e4a90265b -Size (hpp-fcl-2.4.5.tar.gz) = 3339267 bytes -SHA1 (patch-522) = ba85ee06e957613d802c54344b7602583678f051 diff --git a/path/hpp-fcl/patches/patch-522 b/path/hpp-fcl/patches/patch-522 deleted file mode 100644 index 297818e75..000000000 --- a/path/hpp-fcl/patches/patch-522 +++ /dev/null @@ -1,139 +0,0 @@ -From 0f96bf89925b9aabf8b986d031368886ced77187 Mon Sep 17 00:00:00 2001 -From: Guilhem Saurel -Date: Wed, 24 Jan 2024 16:51:42 +0100 -Subject: [PATCH 1/2] CMake: use Findassimp from jrl cmake module - ---- - CMakeLists.txt | 2 +- - cmake-modules/Findassimp.cmake | 108 --------------------------------- - 2 files changed, 1 insertion(+), 109 deletions(-) - delete mode 100644 cmake-modules/Findassimp.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 157689289..1d8957a80 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -77,7 +77,7 @@ include("${JRL_CMAKE_MODULES}/ide.cmake") - include(CMakeDependentOption) - - SET(CMAKE_MODULE_PATH -- ${CMAKE_SOURCE_DIR}/cmake-modules/ -+ ${JRL_CMAKE_MODULES}/find-external/assimp/ - ${CMAKE_MODULE_PATH}) - - set_default_cmake_build_type("RelWithDebInfo") -diff --git a/cmake-modules/Findassimp.cmake b/cmake-modules/Findassimp.cmake -deleted file mode 100644 -index 0b3dba213..000000000 ---- cmake-modules/Findassimp.cmake -+++ /dev/null -@@ -1,108 +0,0 @@ --if(CMAKE_SIZEOF_VOID_P EQUAL 8) -- set(ASSIMP_ARCHITECTURE "64") --elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) -- set(ASSIMP_ARCHITECTURE "32") --endif(CMAKE_SIZEOF_VOID_P EQUAL 8) -- --set(ASSIMP_ROOT_DIR CACHE PATH "ASSIMP root directory") --if(WIN32) -- -- # Find path of each library -- find_path(ASSIMP_INCLUDE_DIR -- NAMES -- assimp/anim.h -- HINTS -- ${ASSIMP_ROOT_DIR}/include -- ) -- SET(assimp_INCLUDE_DIRS ${ASSIMP_INCLUDE_DIR}) -- -- if(MSVC12) -- set(ASSIMP_MSVC_VERSIONS "vc120") -- else() -- set(ASSIMP_MSVC_VERSIONS "vc140;vc141;vc142;vc143") -- endif(MSVC12) -- -- if(MSVC) -- -- find_path(ASSIMP_LIBRARY_DIR -- NAMES -- assimp.lib -- assimpd.lib -- HINTS -- ${ASSIMP_ROOT_DIR}/lib${ASSIMP_ARCHITECTURE} -- ) -- -- find_library(ASSIMP_LIBRARY_RELEASE assimp.lib PATHS ${ASSIMP_LIBRARY_DIR}) -- find_library(ASSIMP_LIBRARY_DEBUG assimpd.lib PATHS ${ASSIMP_LIBRARY_DIR}) -- -- IF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG) -- foreach(ASSIMP_MSVC_VERSION ${ASSIMP_MSVC_VERSIONS}) -- find_path(ASSIMP_LIBRARY_DIR -- NAMES -- assimp-${ASSIMP_MSVC_VERSION}-mt.lib -- assimp-${ASSIMP_MSVC_VERSION}-mtd.lib -- HINTS -- ${ASSIMP_ROOT_DIR}/lib${ASSIMP_ARCHITECTURE} -- ) -- -- find_library(ASSIMP_LIBRARY_RELEASE assimp-${ASSIMP_MSVC_VERSION}-mt.lib PATHS ${ASSIMP_LIBRARY_DIR}) -- find_library(ASSIMP_LIBRARY_DEBUG assimp-${ASSIMP_MSVC_VERSION}-mtd.lib PATHS ${ASSIMP_LIBRARY_DIR}) -- -- IF(ASSIMP_LIBRARY_RELEASE OR ASSIMP_LIBRARY_DEBUG) -- break() -- ENDIF() -- endforeach() -- ENDIF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG) -- -- IF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG) -- SET(assimp_FOUND FALSE) -- return() -- ENDIF() -- -- IF(ASSIMP_LIBRARY_DEBUG) -- set(ASSIMP_LIBRARY -- optimized ${ASSIMP_LIBRARY_RELEASE} -- debug ${ASSIMP_LIBRARY_DEBUG} -- ) -- ELSE() -- set(ASSIMP_LIBRARY -- optimized ${ASSIMP_LIBRARY_RELEASE} -- ) -- ENDIF() -- -- SET(assimp_LIBRARIES ${ASSIMP_LIBRARY}) -- endif() -- --else(WIN32) -- -- find_path( -- assimp_INCLUDE_DIRS -- NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h -- PATHS /usr/local/include -- PATHS /usr/include/ -- HINTS ${ASSIMP_ROOT_DIR}/include -- ) -- -- find_library( -- assimp_LIBRARIES -- NAMES assimp -- PATHS /usr/local/lib/ -- PATHS /usr/lib64/ -- PATHS /usr/lib/ -- ) -- -- if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) -- SET(assimp_FOUND TRUE) -- ENDIF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) -- -- if (assimp_FOUND) -- if (NOT assimp_FIND_QUIETLY) -- message(STATUS "Found asset importer library: ${assimp_LIBRARIES}") -- endif (NOT assimp_FIND_QUIETLY) -- else (assimp_FOUND) -- if (assimp_FIND_REQUIRED) -- message(FATAL_ERROR "Could not find asset importer library") -- endif (assimp_FIND_REQUIRED) -- endif (assimp_FOUND) -- --endif(WIN32) - diff --git a/path/py-coal/DESCR b/path/py-coal/DESCR new file mode 100644 index 000000000..568be7941 --- /dev/null +++ b/path/py-coal/DESCR @@ -0,0 +1,5 @@ +coal is a modified version of the flexible collision library +It provides functions to compute collision and distance computations +between various geometric objects. + +This package provides the python bindings for coal. diff --git a/path/py-hpp-fcl/Makefile b/path/py-coal/Makefile similarity index 71% rename from path/py-hpp-fcl/Makefile rename to path/py-coal/Makefile index e67518d9d..2950b23c6 100644 --- a/path/py-hpp-fcl/Makefile +++ b/path/py-coal/Makefile @@ -1,21 +1,24 @@ -# robotpkg Makefile for: path/py38-hpp-fcl +# robotpkg Makefile for: path/py38-coal # Created: Guilhem Saurel on Tue, 19 Nov 2019 # -HPP_PACKAGE= hpp-fcl -HPP_VERSION= 2.4.5 +ORG= coal-library +NAME= coal +VERSION= 3.0.0 CATEGORIES= path HPP_COMMENT= collision detection and distance computations (python bindingss) LICENSE= 2-clause-bsd +CONFLICTS+= ${PKGTAG.python-}hpp-fcl-[0-9]* -HPP_DOC= no # already in path/hpp-fcl +USE_BOOST_LIBS= thread date_time system filesystem unit_test_framework chrono +USE_BOOST_LIBS+= python +USE_MASTER_GITHUB= true USE_PYTHON_ONLY= yes -include ../../meta-pkgs/hpp/Makefile.common +CMAKE_ARGS+= -DCOAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL=ON -USE_BOOST_LIBS= thread date_time system filesystem unit_test_framework python -USE_BOOST_LIBS+= chrono +include ../../devel/jrl-cmakemodules/Makefile.common include ../../mk/robotpkg.prefs.mk ifeq (,$(filter Ubuntu-16.04 Debian-9,${OPSYS}-${OS_VERSION})) @@ -27,7 +30,7 @@ DEPEND_ABI.assimp+= assimp>=5 include ../../mapping/octomap/depend.mk include ../../math/py-eigenpy/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../pkgtools/pkg-config/depend.mk include ../../mk/sysdep/assimp.mk include ../../mk/sysdep/boost-headers.mk diff --git a/path/py-coal/PLIST b/path/py-coal/PLIST new file mode 100644 index 000000000..96d668d3b --- /dev/null +++ b/path/py-coal/PLIST @@ -0,0 +1,7 @@ +@comment Thu Nov 21 11:29:06 CET 2024 +${PYTHON_SITELIB}/coal/__init__.py +${PYTHON_SITELIB}/coal/coal_pywrap${PYTHON_EXT_SUFFIX} +${PYTHON_SITELIB}/coal/viewer.py +${PYTHON_SITELIB}/coal/windows_dll_manager.py +${PYTHON_SITELIB}/hppfcl/__init__.py +${PYTHON_SITELIB}/hppfcl/viewer.py diff --git a/path/py-coal/depend.mk b/path/py-coal/depend.mk new file mode 100644 index 000000000..bd8ee7e91 --- /dev/null +++ b/path/py-coal/depend.mk @@ -0,0 +1,29 @@ +# robotpkg depend.mk for: path/py38-coal +# Created: Guilhem Saurel on Tue, 19 Nov 2019 +# + +DEPEND_DEPTH:= ${DEPEND_DEPTH}+ +PY_COAL_DEPEND_MK:= ${PY_COAL_DEPEND_MK}+ + +ifeq (+,$(DEPEND_DEPTH)) +DEPEND_PKG+= py-coal +endif + +ifeq (+,$(PY_COAL_DEPEND_MK)) # -------------------------------------------- + +PREFER.py-coal?= robotpkg + +DEPEND_USE+= py-coal + +DEPEND_ABI.py-coal?= ${PKGTAG.python-}coal>=3.0.0 +DEPEND_DIR.py-coal?= ../../path/py-coal + +SYSTEM_SEARCH.py-coal= \ + '${PYTHON_SYSLIBSEARCH}/coal/__init__.py' + +include ../../path/coal/depend.mk +include ../../math/py-eigenpy/depend.mk + +endif # PY_COAL_DEPEND_MK -------------------------------------------------- + +DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/path/py-coal/distinfo b/path/py-coal/distinfo new file mode 100644 index 000000000..6bc2e39f8 --- /dev/null +++ b/path/py-coal/distinfo @@ -0,0 +1,4 @@ +SHA1 (coal-3.0.0.tar.gz) = becfa6e23e422ebd25287cbeea393e7efa639ec9 +RMD160 (coal-3.0.0.tar.gz) = 842216d6e152ff00788e1d27acbdc95f0e6cc8a0 +Size (coal-3.0.0.tar.gz) = 3400535 bytes +SHA1 (patch-aa) = 29474cc7abf2123ab0b21eb68630e6888c37ab20 diff --git a/path/py-hpp-fcl/patches/patch-aa b/path/py-coal/patches/patch-aa similarity index 62% rename from path/py-hpp-fcl/patches/patch-aa rename to path/py-coal/patches/patch-aa index edab3fe93..305b9220c 100644 --- a/path/py-hpp-fcl/patches/patch-aa +++ b/path/py-coal/patches/patch-aa @@ -1,20 +1,19 @@ -Don't install files already installed by hpp-fcl +Don't install files already installed by coal ---- CMakeLists.txt.orig 2024-03-06 18:02:09.000000000 +0100 -+++ CMakeLists.txt 2024-03-12 14:59:02.347555230 +0100 +--- CMakeLists.txt.orig 2024-11-20 14:19:37.000000000 +0100 ++++ CMakeLists.txt 2024-11-21 11:17:32.799174093 +0100 @@ -39,7 +39,6 @@ set(PROJECT_DESCRIPTION - "HPP fork of FCL -- The Flexible Collision Library" + "Coal, The Collision Detection Library. Previously known as HPP-FCL, fork of FCL -- The Flexible Collision Library" ) -SET(PROJECT_USE_CMAKE_EXPORT TRUE) SET(PROJECT_COMPATIBILITY_VERSION AnyNewerVersion) + # To enable jrl-cmakemodules compatibility with workspace we must define the two + # following lines +@@ -472,16 +471,6 @@ + "-DCOAL_HAS_OCTOMAP -DCOAL_HAVE_OCTOMAP -DFCL_HAVE_OCTOMAP -DOCTOMAP_MAJOR_VERSION=${OCTOMAP_MAJOR_VERSION} -DOCTOMAP_MINOR_VERSION=${OCTOMAP_MINOR_VERSION} -DOCTOMAP_PATCH_VERSION=${OCTOMAP_PATCH_VERSION}") + ENDIF(COAL_HAS_OCTOMAP) - SET(PROJECT_USE_KEYWORD_LINK_LIBRARIES TRUE) -@@ -297,13 +296,3 @@ - PKG_CONFIG_APPEND_CFLAGS( - "-DHPP_FCL_HAS_OCTOMAP -DHPP_FCL_HAVE_OCTOMAP -DFCL_HAVE_OCTOMAP -DOCTOMAP_MAJOR_VERSION=${OCTOMAP_MAJOR_VERSION} -DOCTOMAP_MINOR_VERSION=${OCTOMAP_MINOR_VERSION} -DOCTOMAP_PATCH_VERSION=${OCTOMAP_PATCH_VERSION}") - ENDIF(HPP_FCL_HAS_OCTOMAP) -- -# Install catkin package.xml -INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME}) -# Allows Colcon to find non-Ament packages when using workspace underlays @@ -24,9 +23,13 @@ Don't install files already installed by hpp-fcl -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv DESTINATION share/${PROJECT_NAME}/hook) -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv "prepend-non-duplicate;PYTHONPATH;${PYTHON_SITELIB}") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv DESTINATION share/${PROJECT_NAME}/hook) ---- src/CMakeLists.txt.orig 2024-03-06 18:02:09.000000000 +0100 -+++ src/CMakeLists.txt 2024-03-12 14:59:38.130788867 +0100 -@@ -234,11 +234,3 @@ +- + if(COAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL) + include(CMakePackageConfigHelpers) + write_basic_package_version_file(hpp-fclConfigVersion.cmake +--- src/CMakeLists.txt.orig 2024-11-20 14:19:37.000000000 +0100 ++++ src/CMakeLists.txt 2024-11-21 11:18:09.208970627 +0100 +@@ -278,11 +278,3 @@ -DOCTOMAP_MINOR_VERSION=${OCTOMAP_MINOR_VERSION} -DOCTOMAP_PATCH_VERSION=${OCTOMAP_PATCH_VERSION}) ENDIF(octomap_FOUND) diff --git a/path/py-hpp-affordance-corba/Makefile b/path/py-hpp-affordance-corba/Makefile index 129ce3429..7f40f626e 100644 --- a/path/py-hpp-affordance-corba/Makefile +++ b/path/py-hpp-affordance-corba/Makefile @@ -2,6 +2,7 @@ # Created: Guilhem Saurel on Wed, 21 Apr 2021 # +PKGREVISION= 1 HPP_PACKAGE= hpp-affordance-corba HPP_COMMENT= Extract Whole-Body Affordances for Mutli-Contact Planning (CORBA bindings) @@ -21,7 +22,7 @@ include ../../middleware/py-omniORBpy/depend.mk include ../../path/hpp-constraints/depend.mk include ../../path/hpp-core/depend.mk include ../../path/py-hpp-corbaserver/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../path/hpp-util/depend.mk include ../../mapping/octomap/depend.mk diff --git a/path/py-hpp-bezier-com-traj/Makefile b/path/py-hpp-bezier-com-traj/Makefile index 22f8f1c6a..d7074acf9 100644 --- a/path/py-hpp-bezier-com-traj/Makefile +++ b/path/py-hpp-bezier-com-traj/Makefile @@ -2,28 +2,28 @@ # Created: Guilhem Saurel on Tue, 13 Apr 2021 # -HPP_PACKAGE= hpp-bezier-com-traj -HPP_COMMENT= trajectory generation for the COM with bezier curves +PKGREVISION= 1 +HPP_PACKAGE= hpp-bezier-com-traj +HPP_COMMENT= trajectory generation for the COM with bezier curves -CATEGORIES= path +CATEGORIES= path -USE_BOOST_LIBS= python -PYTHON_NOTAG_CONFLICT= yes +USE_BOOST_LIBS= python +PYTHON_NOTAG_CONFLICT= yes include ../../meta-pkgs/hpp/Makefile.common include ../../math/eigen3/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../math/pinocchio/depend.mk include ../../math/ndcurves/depend.mk include ../../math/py-eigenpy/depend.mk -include ../../path/py-hpp-fcl/depend.mk +include ../../path/py-coal/depend.mk include ../../math/py-pinocchio/depend.mk include ../../math/py-ndcurves/depend.mk include ../../path/py-hpp-centroidal-dynamics/depend.mk include ../../mk/sysdep/boost-headers.mk include ../../mk/sysdep/boost-libs.mk - include ../../mk/language/c.mk include ../../mk/language/c++.mk include ../../mk/robotpkg.mk diff --git a/path/py-hpp-fcl/DESCR b/path/py-hpp-fcl/DESCR deleted file mode 100644 index e6965c78b..000000000 --- a/path/py-hpp-fcl/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -hpp-fcl is a modified version of the flexible collision library -It provides functions to compute collision and distance computations -between various geometric objects. - -This package provides the python bindings for hpp-fcl. diff --git a/path/py-hpp-fcl/PLIST b/path/py-hpp-fcl/PLIST deleted file mode 100644 index 69106712f..000000000 --- a/path/py-hpp-fcl/PLIST +++ /dev/null @@ -1,4 +0,0 @@ -@comment Thu Dec 12 11:11:59 CET 2019 -${PYTHON_SITELIB}/hppfcl/__init__.py -${PYTHON_SITELIB}/hppfcl/hppfcl${PYTHON_EXT_SUFFIX} -${PYTHON_SITELIB}/hppfcl/viewer.py diff --git a/path/py-hpp-fcl/depend.mk b/path/py-hpp-fcl/depend.mk deleted file mode 100644 index bc1d5692e..000000000 --- a/path/py-hpp-fcl/depend.mk +++ /dev/null @@ -1,29 +0,0 @@ -# robotpkg depend.mk for: path/py38-hpp-fcl -# Created: Guilhem Saurel on Tue, 19 Nov 2019 -# - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -PY_HPP_FCL_DEPEND_MK:= ${PY_HPP_FCL_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= py-hpp-fcl -endif - -ifeq (+,$(PY_HPP_FCL_DEPEND_MK)) # -------------------------------------------- - -PREFER.py-hpp-fcl?= robotpkg - -DEPEND_USE+= py-hpp-fcl - -DEPEND_ABI.py-hpp-fcl?= ${PKGTAG.python-}hpp-fcl>=1.2.0 -DEPEND_DIR.py-hpp-fcl?= ../../path/py-hpp-fcl - -SYSTEM_SEARCH.py-hpp-fcl= \ - '${PYTHON_SYSLIBSEARCH}/hppfcl/__init__.py' - -include ../../path/hpp-fcl/depend.mk -include ../../math/py-eigenpy/depend.mk - -endif # PY_HPP_FCL_DEPEND_MK -------------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/path/py-hpp-fcl/distinfo b/path/py-hpp-fcl/distinfo deleted file mode 100644 index 6f7c07a35..000000000 --- a/path/py-hpp-fcl/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -SHA1 (hpp-fcl-2.4.5.tar.gz) = 96fb20cca5dcd2623f4977503cd541e1bc10a751 -RMD160 (hpp-fcl-2.4.5.tar.gz) = a4a81a2a2ce4778b9efeacc17c28ef1e4a90265b -Size (hpp-fcl-2.4.5.tar.gz) = 3339267 bytes -SHA1 (patch-522) = ba85ee06e957613d802c54344b7602583678f051 -SHA1 (patch-aa) = 21a3a79910a4f21656efe2e2cc8d69aa26454ee3 diff --git a/path/py-hpp-fcl/patches/patch-522 b/path/py-hpp-fcl/patches/patch-522 deleted file mode 100644 index 297818e75..000000000 --- a/path/py-hpp-fcl/patches/patch-522 +++ /dev/null @@ -1,139 +0,0 @@ -From 0f96bf89925b9aabf8b986d031368886ced77187 Mon Sep 17 00:00:00 2001 -From: Guilhem Saurel -Date: Wed, 24 Jan 2024 16:51:42 +0100 -Subject: [PATCH 1/2] CMake: use Findassimp from jrl cmake module - ---- - CMakeLists.txt | 2 +- - cmake-modules/Findassimp.cmake | 108 --------------------------------- - 2 files changed, 1 insertion(+), 109 deletions(-) - delete mode 100644 cmake-modules/Findassimp.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 157689289..1d8957a80 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -77,7 +77,7 @@ include("${JRL_CMAKE_MODULES}/ide.cmake") - include(CMakeDependentOption) - - SET(CMAKE_MODULE_PATH -- ${CMAKE_SOURCE_DIR}/cmake-modules/ -+ ${JRL_CMAKE_MODULES}/find-external/assimp/ - ${CMAKE_MODULE_PATH}) - - set_default_cmake_build_type("RelWithDebInfo") -diff --git a/cmake-modules/Findassimp.cmake b/cmake-modules/Findassimp.cmake -deleted file mode 100644 -index 0b3dba213..000000000 ---- cmake-modules/Findassimp.cmake -+++ /dev/null -@@ -1,108 +0,0 @@ --if(CMAKE_SIZEOF_VOID_P EQUAL 8) -- set(ASSIMP_ARCHITECTURE "64") --elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) -- set(ASSIMP_ARCHITECTURE "32") --endif(CMAKE_SIZEOF_VOID_P EQUAL 8) -- --set(ASSIMP_ROOT_DIR CACHE PATH "ASSIMP root directory") --if(WIN32) -- -- # Find path of each library -- find_path(ASSIMP_INCLUDE_DIR -- NAMES -- assimp/anim.h -- HINTS -- ${ASSIMP_ROOT_DIR}/include -- ) -- SET(assimp_INCLUDE_DIRS ${ASSIMP_INCLUDE_DIR}) -- -- if(MSVC12) -- set(ASSIMP_MSVC_VERSIONS "vc120") -- else() -- set(ASSIMP_MSVC_VERSIONS "vc140;vc141;vc142;vc143") -- endif(MSVC12) -- -- if(MSVC) -- -- find_path(ASSIMP_LIBRARY_DIR -- NAMES -- assimp.lib -- assimpd.lib -- HINTS -- ${ASSIMP_ROOT_DIR}/lib${ASSIMP_ARCHITECTURE} -- ) -- -- find_library(ASSIMP_LIBRARY_RELEASE assimp.lib PATHS ${ASSIMP_LIBRARY_DIR}) -- find_library(ASSIMP_LIBRARY_DEBUG assimpd.lib PATHS ${ASSIMP_LIBRARY_DIR}) -- -- IF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG) -- foreach(ASSIMP_MSVC_VERSION ${ASSIMP_MSVC_VERSIONS}) -- find_path(ASSIMP_LIBRARY_DIR -- NAMES -- assimp-${ASSIMP_MSVC_VERSION}-mt.lib -- assimp-${ASSIMP_MSVC_VERSION}-mtd.lib -- HINTS -- ${ASSIMP_ROOT_DIR}/lib${ASSIMP_ARCHITECTURE} -- ) -- -- find_library(ASSIMP_LIBRARY_RELEASE assimp-${ASSIMP_MSVC_VERSION}-mt.lib PATHS ${ASSIMP_LIBRARY_DIR}) -- find_library(ASSIMP_LIBRARY_DEBUG assimp-${ASSIMP_MSVC_VERSION}-mtd.lib PATHS ${ASSIMP_LIBRARY_DIR}) -- -- IF(ASSIMP_LIBRARY_RELEASE OR ASSIMP_LIBRARY_DEBUG) -- break() -- ENDIF() -- endforeach() -- ENDIF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG) -- -- IF(NOT ASSIMP_LIBRARY_RELEASE AND NOT ASSIMP_LIBRARY_DEBUG) -- SET(assimp_FOUND FALSE) -- return() -- ENDIF() -- -- IF(ASSIMP_LIBRARY_DEBUG) -- set(ASSIMP_LIBRARY -- optimized ${ASSIMP_LIBRARY_RELEASE} -- debug ${ASSIMP_LIBRARY_DEBUG} -- ) -- ELSE() -- set(ASSIMP_LIBRARY -- optimized ${ASSIMP_LIBRARY_RELEASE} -- ) -- ENDIF() -- -- SET(assimp_LIBRARIES ${ASSIMP_LIBRARY}) -- endif() -- --else(WIN32) -- -- find_path( -- assimp_INCLUDE_DIRS -- NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h -- PATHS /usr/local/include -- PATHS /usr/include/ -- HINTS ${ASSIMP_ROOT_DIR}/include -- ) -- -- find_library( -- assimp_LIBRARIES -- NAMES assimp -- PATHS /usr/local/lib/ -- PATHS /usr/lib64/ -- PATHS /usr/lib/ -- ) -- -- if (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) -- SET(assimp_FOUND TRUE) -- ENDIF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) -- -- if (assimp_FOUND) -- if (NOT assimp_FIND_QUIETLY) -- message(STATUS "Found asset importer library: ${assimp_LIBRARIES}") -- endif (NOT assimp_FIND_QUIETLY) -- else (assimp_FOUND) -- if (assimp_FIND_REQUIRED) -- message(FATAL_ERROR "Could not find asset importer library") -- endif (assimp_FIND_REQUIRED) -- endif (assimp_FOUND) -- --endif(WIN32) - diff --git a/robots/py-example-robot-data/Makefile b/robots/py-example-robot-data/Makefile index 81f2de2d4..42f57f641 100644 --- a/robots/py-example-robot-data/Makefile +++ b/robots/py-example-robot-data/Makefile @@ -2,10 +2,10 @@ # Created: Guilhem Saurel on Tue, 14 Apr 2020 # +PKGREVISION= 2 ORG= gepetto NAME= example-robot-data VERSION= 4.1.0 -PKGREVISION= 1 CATEGORIES= robots COMMENT= Robot URDFs for benchmarking and developed examples @@ -22,7 +22,7 @@ include ../../math/eigen3/depend.mk include ../../math/pinocchio/depend.mk include ../../math/py-eigenpy/depend.mk include ../../math/py-pinocchio/depend.mk -include ../../path/hpp-fcl/depend.mk +include ../../path/coal/depend.mk include ../../pkgtools/pkg-config/depend.mk include ../../robots/example-robot-data/depend.mk include ../../mk/sysdep/cmake.mk