summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:56 +0100
committerTim Rakowski2017-12-21 23:29:56 +0100
commit4ddc8c65b28f8e42d9125b8297969c9888a9ef27 (patch)
tree0447eaa65c370e010d776166875bbf548751a31b
parentf8a74233f1286af68a5ac17a4bb124550ae0c1aa (diff)
downloadaur-ros-ardent-gtest-vendor.tar.gz
Update to version 1.8.0-4
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD12
2 files changed, 5 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ff2efc10c64..f96edc361e13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:42:00 UTC 2017
+# Thu Dec 21 22:29:53 UTC 2017
pkgbase = ros-ardent-gtest-vendor
pkgdesc = ROS - The package provides GoogleTest.
pkgver = 1.8.0
diff --git a/PKGBUILD b/PKGBUILD
index e61f41d6e67d..6a058aebac6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -40,17 +40,13 @@ 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
+
# 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
}