Update to version 1.0.0-1

2 files changed, 11 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9ae62c1a83a..02981e3d3ced 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:42:46 UTC 2017
+# Thu Dec 21 22:29:52 UTC 2017
 pkgbase = ros-ardent-poco-vendor
 	pkgdesc = ROS - CMake shim over the poco library.
 	pkgver = 1.0.0
@@ -9,10 +9,11 @@ pkgbase = ros-ardent-poco-vendor
 	license = Apache License 2.0, Boost Software License 1.0
 	makedepends = cmake
 	makedepends = ros-build-tools
-	depends = expat
 	depends = zlib
-	depends = pcre
 	depends = sqlite
+	depends = cmake
+	depends = pcre
+	depends = expat
 	source = ros-ardent-poco-vendor-1.0.0-0.tar.gz::https://github.com/ros2-gbp/poco_vendor-release/archive/release/ardent/poco_vendor/1.0.0-0.tar.gz
 	sha256sums = 2d21ebb3da262bf26239d1fde5cb0a53422a831fce7cb8a839b58d4f6879d68b
 
diff --git a/PKGBUILD b/PKGBUILD
index f922c5d86d00..60507803496b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,10 +16,11 @@ makedepends=('cmake' 'ros-build-tools'
 
 ros_depends=()
 depends=(${ros_depends[@]}
-  expat
   zlib
+  sqlite
+  cmake
   pcre
-  sqlite)
+  expat)
 
 # Git version (e.g. for debugging)
 # _tag=release/ardent/poco_vendor/${pkgver}-${_pkgver_patch}
@@ -44,17 +45,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
 }