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 864aaf2df630..1c63bd15e4fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 19 18:26:09 UTC 2017
+# Thu Dec 21 22:29:50 UTC 2017
pkgbase = ros-ardent-ament-cmake-include-directories
pkgdesc = ROS - The functionality to order include directories according to a chain of prefixes in the ament buildsystem in CMake.
pkgver = 0.4.0
@@ -9,7 +9,7 @@ pkgbase = ros-ardent-ament-cmake-include-directories
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-include-directories-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ament_cmake-release/archive/release/ardent/ament_cmake_include_directories/0.4.0-0.tar.gz
sha256sums = f49022d6ccb9c3fb715cd21efde100d074c5db8f312885137b1db4fbe3122739
diff --git a/PKGBUILD b/PKGBUILD
index de4580fc2804..cf7ec7935ac7 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
}