summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD19
2 files changed, 10 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d68a383e6b5..067b1780a92 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:45:35 UTC 2017
+# Thu Dec 21 22:29:49 UTC 2017
pkgbase = ros-ardent-teleop-twist-joy
pkgdesc = ROS - Generic joystick teleop for twist robots.
pkgver = 2.0.0
@@ -10,9 +10,9 @@ pkgbase = ros-ardent-teleop-twist-joy
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake-ros
+ depends = ros-ardent-sensor-msgs
depends = ros-ardent-rclcpp
depends = ros-ardent-geometry-msgs
- depends = ros-ardent-sensor-msgs
source = ros-ardent-teleop-twist-joy-2.0.0-0.tar.gz::https://github.com/ros2-gbp/teleop_twist_joy-release/archive/release/ardent/teleop_twist_joy/2.0.0-0.tar.gz
sha256sums = b0c0ea67663601f4792f96f3f9d3ac59fc8daaba95543085371b9e02a5d6dfbf
diff --git a/PKGBUILD b/PKGBUILD
index 40719bdd212..3e04df2a469 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,9 +14,9 @@ ros_makedepends=(ros-ardent-ament-cmake-ros)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-ardent-rclcpp
- ros-ardent-geometry-msgs
- ros-ardent-sensor-msgs)
+ros_depends=(ros-ardent-sensor-msgs
+ ros-ardent-rclcpp
+ ros-ardent-geometry-msgs)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
@@ -42,17 +42,14 @@ build() {
# Fix Python2/Python3 conflicts
/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 "${srcdir}/${_dir}"
+ export PYTHONPATH=/opt/ros/ardent/lib/python3.6/site-packages
+ export AMENT_PREFIX_PATH=/opt/ros/ardent
+
# Build project
cmake "${srcdir}/${_dir}" \
-DCMAKE_BUILD_TYPE=Release \
- -DCATKIN_BUILD_BINARY_PACKAGE=ON \
- -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent \
- -DPYTHON_EXECUTABLE=/usr/bin/python3 \
- -DPYTHON_INCLUDE_DIR=/usr/include/python3.5m \
- -DPYTHON_LIBRARY=/usr/lib/libpython3.5m.so \
- -DPYTHON_BASENAME=.cpython-35m \
- -DSETUPTOOLS_DEB_LAYOUT=OFF \
- -DCATKIN_ENABLE_TESTING=OFF
+ -DBUILD_TESTING=Off \
+ -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent
make
}