Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Noetic release #4

Merged
merged 4 commits into from
May 15, 2020
Merged

Noetic release #4

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d45ca91
Bump CMake version to avoid CMP0048 warning
ahcorde Apr 2, 2020
fd56654
Use setuptools instead of distutils
ahcorde Apr 2, 2020
9de2aa8
Use format 3
sloretz May 12, 2020
e2ad177
Use setuptools always
sloretz May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(rqt_robot_dashboard)
# Load catkin and all dependencies required for this package
find_package(catkin REQUIRED)
Expand Down
5 changes: 4 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/env python

from distutils.core import setup
try:
from distutils.core import setup
except ImportError:
from setuptools import setup
from catkin_pkg.python_setup import generate_distutils_setup

d = generate_distutils_setup(
Expand Down