Update to version 0.4.0-1

2 files changed, 7 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eddd88e9e1d6..503ee54a2a56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:45:43 UTC 2017
+# Thu Dec 21 22:29:50 UTC 2017
 pkgbase = ros-ardent-tinyxml-vendor
 	pkgdesc = ROS - CMake shim over the tinxml library.
 	pkgver = 0.4.0
@@ -9,6 +9,7 @@ pkgbase = ros-ardent-tinyxml-vendor
 	license = Apache License 2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
+	depends = cmake
 	depends = tinyxml
 	source = ros-ardent-tinyxml-vendor-0.4.0-0.tar.gz::https://github.com/ros2-gbp/tinyxml_vendor-release/archive/release/ardent/tinyxml_vendor/0.4.0-0.tar.gz
 	sha256sums = 2ad2557befaafb59b496ee956120991f30d3a2e3cdc7e0e37820ea5c885ba228
diff --git a/PKGBUILD b/PKGBUILD
index 3ce4e7450599..115f16cdcb70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,6 +16,7 @@ makedepends=('cmake' 'ros-build-tools'
 
 ros_depends=()
 depends=(${ros_depends[@]}
+  cmake
   tinyxml)
 
 # Git version (e.g. for debugging)
@@ -41,17 +42,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
 }