summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD17
2 files changed, 9 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e8d51ef2f720..643748ad03b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:45:09 UTC 2017
+# Thu Dec 21 22:29:54 UTC 2017
pkgbase = ros-ardent-rviz2
pkgdesc = ROS - 3D visualization tool for ROS.
pkgver = 2.0.0
@@ -11,8 +11,8 @@ pkgbase = ros-ardent-rviz2
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake
makedepends = qt5-base
- depends = ros-ardent-rviz-ogre-vendor
depends = ros-ardent-rviz-common
+ depends = ros-ardent-rviz-ogre-vendor
source = ros-ardent-rviz2-2.0.0-5.tar.gz::https://github.com/ros2-gbp/rviz-release/archive/release/ardent/rviz2/2.0.0-5.tar.gz
sha256sums = 370c4cfcda241dd3c365654e5fff0022cabf44bfb50c33aad84d70fd0f8c9e57
diff --git a/PKGBUILD b/PKGBUILD
index 379a35f932dc..f62a7a78fb3d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,8 +15,8 @@ makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]}
qt5-base)
-ros_depends=(ros-ardent-rviz-ogre-vendor
- ros-ardent-rviz-common)
+ros_depends=(ros-ardent-rviz-common
+ ros-ardent-rviz-ogre-vendor)
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
}