summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rakowski2017-12-21 23:29:55 +0100
committerTim Rakowski2017-12-21 23:29:55 +0100
commit3655d0d12d7b424490009daa2f331542c4136bd4 (patch)
treed6b730bbe6c91fa80adc7aba130928a6a234083c
parent36be10e4843296e0fe5efe76327c46d7f8773e01 (diff)
downloadaur-ros-ardent-opensplice-cmake-module.tar.gz
Update to version 0.4.0-1
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
2 files changed, 8 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 987b43bc35ce..4174dcbbc9dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:42:31 UTC 2017
+# Thu Dec 21 22:29:51 UTC 2017
pkgbase = ros-ardent-opensplice-cmake-module
pkgdesc = ROS - Provide CMake module to find PrismTech OpenSplice.
pkgver = 0.4.0
@@ -10,7 +10,7 @@ pkgbase = ros-ardent-opensplice-cmake-module
makedepends = cmake
makedepends = ros-build-tools
makedepends = ros-ardent-ament-cmake
- makedepends = opensplice
+ makedepends = opensplice-dds
source = ros-ardent-opensplice-cmake-module-0.4.0-0.tar.gz::https://github.com/ros2-gbp/rmw_opensplice-release/archive/release/ardent/opensplice_cmake_module/0.4.0-0.tar.gz
sha256sums = 9c4d07420b35fd9a977cfec9ba29e0aeef370defb6aed52e932b3bda38b90178
diff --git a/PKGBUILD b/PKGBUILD
index f537faf88c85..8b1c4603ee06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ license=('Apache License 2.0')
ros_makedepends=(ros-ardent-ament-cmake)
makedepends=('cmake' 'ros-build-tools'
${ros_makedepends[@]}
- opensplice)
+ opensplice-dds)
ros_depends=()
depends=(${ros_depends[@]})
@@ -41,17 +41,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
}