summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:56 +0100
committerTim Rakowski2017-12-21 23:29:56 +0100
commite7ab78fd3c5a87f44464c94afb6278ec1ced23f4 (patch)
tree1be514f3741cc7003f33a0d9f7c0341bbbc3bc1e
parent80dfb150b2c9b5f6f1834183f918ae96999160c8 (diff)
downloadaur-ros-ardent-ament-cmake-gtest.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD19
2 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7d85a6fa103a..485e73f56a93 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:26:06 UTC 2017
+# Thu Dec 21 22:29:52 UTC 2017
pkgbase = ros-ardent-ament-cmake-gtest
pkgdesc = ROS - The ability to add gtest-based tests in the ament buildsystem in CMake.
pkgver = 0.4.0
@@ -10,6 +10,9 @@ pkgbase = ros-ardent-ament-cmake-gtest
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake-core
+ depends = ros-ardent-gtest-vendor
+ depends = ros-ardent-ament-cmake-test
+ depends = gtest
source = ros-ardent-ament-cmake-gtest-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ament_cmake-release/archive/release/ardent/ament_cmake_gtest/0.4.0-0.tar.gz
sha256sums = 2146efe1cdc0e9a20ab694f4bb8333cdb10c73e6547510a7a06c79ac7263eb01
diff --git a/PKGBUILD b/PKGBUILD
index abfc5bce95f5..8abd6ee33b73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,10 @@ ros_makedepends=(ros-ardent-ament-cmake-core)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=()
-depends=(${ros_depends[@]})
+ros_depends=(ros-ardent-gtest-vendor
+ ros-ardent-ament-cmake-test)
+depends=(${ros_depends[@]}
+ gtest)
# Git version (e.g. for debugging)
# _tag=release/ardent/ament_cmake_gtest/${pkgver}-${_pkgver_patch}
@@ -40,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
}