noetic release (#36)
* Bump CMake version to avoid CMP0048 warning Signed-off-by: ahcorde <ahcorde@gmail.com> * Use setuptools instead of distutils Signed-off-by: ahcorde <ahcorde@gmail.com> * Add buildtool depend on setuptools Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> * Remove unnecessary option 'package_dir' Signed-off-by: Shane Loretz <sloretz@osrfoundation.org> Co-authored-by: Shane Loretz <sloretz@osrfoundation.org>
This commit is contained in:
parent
5fe5c3b240
commit
5ae05764da
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 2.8.3)
|
||||
cmake_minimum_required(VERSION 3.0.2)
|
||||
|
||||
project(kdl_parser)
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
cmake_minimum_required(VERSION 2.8.3)
|
||||
cmake_minimum_required(VERSION 3.0.2)
|
||||
|
||||
project(kdl_parser_py)
|
||||
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
<url type="bugtracker">https://github.com/ros/kdl_parser/issues</url>
|
||||
|
||||
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
|
||||
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
|
||||
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
|
||||
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-catkin-pkg</buildtool_depend>
|
||||
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-catkin-pkg</buildtool_depend>
|
||||
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
from distutils.core import setup
|
||||
from setuptools import setup
|
||||
from catkin_pkg.python_setup import generate_distutils_setup
|
||||
|
||||
d = generate_distutils_setup(
|
||||
packages=['kdl_parser_py'],
|
||||
package_dir={'': ''}
|
||||
packages=['kdl_parser_py']
|
||||
)
|
||||
|
||||
setup(**d)
|
||||
|
|
Loading…
Reference in New Issue