Update to version 0.4.0-1

2 files changed, 32 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 436cf70c59e9..e25cc9c87db2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:26:28 UTC 2017
+# Thu Dec 21 22:29:47 UTC 2017
 pkgbase = ros-ardent-ament-cmake
 	pkgdesc = ROS - The entry point package for the ament buildsystem in CMake.
 	pkgver = 0.4.0
@@ -9,8 +9,18 @@ pkgbase = ros-ardent-ament-cmake
 	license = Apache License 2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-ardent-ament-cmake-core
-	makedepends = ros-ardent-ament-cmake-export-dependencies
+	depends = ros-ardent-ament-cmake-export-include-directories
+	depends = ros-ardent-ament-cmake-export-libraries
+	depends = ros-ardent-ament-cmake-python
+	depends = ros-ardent-ament-cmake-libraries
+	depends = ros-ardent-ament-cmake-target-dependencies
+	depends = ros-ardent-ament-cmake-test
+	depends = ros-ardent-ament-cmake-export-dependencies
+	depends = ros-ardent-ament-cmake-export-interfaces
+	depends = ros-ardent-ament-cmake-export-definitions
+	depends = ros-ardent-ament-cmake-export-link-flags
+	depends = ros-ardent-ament-cmake-core
+	depends = cmake
 	source = ros-ardent-ament-cmake-0.4.0-0.tar.gz::https://github.com/ros2-gbp/ament_cmake-release/archive/release/ardent/ament_cmake/0.4.0-0.tar.gz
 	sha256sums = 87d7a097ab6330b4f0f54eef9216437a7b54e7105477b8f8d539a1aee1626318
 
diff --git a/PKGBUILD b/PKGBUILD
index 7b1fe9bcef19..5785eb59cde5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,13 +10,23 @@ arch=('any')
 pkgrel=1
 license=('Apache License 2.0')
 
-ros_makedepends=(ros-ardent-ament-cmake-core
-  ros-ardent-ament-cmake-export-dependencies)
+ros_makedepends=()
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=()
-depends=(${ros_depends[@]})
+ros_depends=(ros-ardent-ament-cmake-export-include-directories
+  ros-ardent-ament-cmake-export-libraries
+  ros-ardent-ament-cmake-python
+  ros-ardent-ament-cmake-libraries
+  ros-ardent-ament-cmake-target-dependencies
+  ros-ardent-ament-cmake-test
+  ros-ardent-ament-cmake-export-dependencies
+  ros-ardent-ament-cmake-export-interfaces
+  ros-ardent-ament-cmake-export-definitions
+  ros-ardent-ament-cmake-export-link-flags
+  ros-ardent-ament-cmake-core)
+depends=(${ros_depends[@]}
+  cmake)
 
 # Git version (e.g. for debugging)
 # _tag=release/ardent/ament_cmake/${pkgver}-${_pkgver_patch}
@@ -41,17 +51,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
 }