summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:55 +0100
committerTim Rakowski2017-12-21 23:29:55 +0100
commit37492297037ba7d15dc7f615d8d06ac9e8dd9eac (patch)
tree74ac4260b22cf58f478b57a99afcf89708543053
parent9f762b243984dd2a0442c798ed86f7d4bb092a8f (diff)
downloadaur-37492297037ba7d15dc7f615d8d06ac9e8dd9eac.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
2 files changed, 9 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8985a4ff1f2..85670b36063 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:26:25 UTC 2017
+# Thu Dec 21 22:29:48 UTC 2017
pkgbase = ros-ardent-ament-cmake-test
pkgdesc = ROS - The ability to add tests in the ament buildsystem in CMake.
pkgver = 0.4.0
@@ -9,7 +9,7 @@ pkgbase = ros-ardent-ament-cmake-test
license = Apache License 2.0
makedepends = cmake
makedepends = ros-build-tools
- makedepends = ros-ardent-ament-cmake-core
+ depends = ros-ardent-ament-cmake-core
source = ros-ardent-ament-cmake-test-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ament_cmake-release/archive/release/ardent/ament_cmake_test/0.4.0-0.tar.gz
sha256sums = e8a951f47c32234c5af659fdd753259758f04a65ae40b998879f9bd06c7f9683
diff --git a/PKGBUILD b/PKGBUILD
index 6be22e9f60a..e67f66ab342 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,11 +10,11 @@ arch=('any')
pkgrel=1
license=('Apache License 2.0')
-ros_makedepends=(ros-ardent-ament-cmake-core)
+ros_makedepends=()
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=()
+ros_depends=(ros-ardent-ament-cmake-core)
depends=(${ros_depends[@]})
# Git version (e.g. for debugging)
@@ -40,17 +40,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
}