update to 2.5.4-3

2 files changed, 12 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 98c414dd3fc2..59fdc9e12347 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = ros2-humble-moveit-simple-controller-manager
 	pkgdesc = A generic, simple controller manager plugin for MoveIt
 	pkgver = 2.5.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://index.ros.org/p/moveit_simple_controller_manager/
 	arch = any
 	makedepends = ros2-humble-moveit-common
+	makedepends = cmake
 	depends = ros2-humble
 	depends = ros2-humble-control-msgs
 	source = https://github.com/ros-planning/moveit2/archive/refs/tags/2.5.4.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index e26640a8c876..b4aff87c3786 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,16 @@
 # Maintainer: Angelo Elias Dal Zotto <angelodalzotto97@gmail.com>
 
+_pkgroot=moveit2
 _pkgname=moveit_plugins/moveit_simple_controller_manager
 pkgname=ros2-humble-moveit-simple-controller-manager
 pkgver=2.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A generic, simple controller manager plugin for MoveIt"
 url="https://index.ros.org/p/moveit_simple_controller_manager/"
 arch=('any')
 makedepends=(
     'ros2-humble-moveit-common'
+    'cmake'
 )
 depends=(
     'ros2-humble'
@@ -19,17 +21,17 @@ sha256sums=('42ac45e2631d59203edfdfc2f521312f7ddef04ff5baf1fec43c65f79495d7a6')
 
 prepare() {
     source /opt/ros/humble/setup.bash
-
-    cmake -S moveit2-$pkgver/$_pkgname -B build \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/humble
 }
 
 build() {
-source /opt/ros/humble/setup.bash
-    make -C build
+    cmake -B build -S "$_pkgroot-$pkgver/$_pkgname" \
+        -DCMAKE_BUILD_TYPE='None' \
+        -DCMAKE_INSTALL_PREFIX='/opt/ros/humble' \
+        -Wno-dev
+    
+    cmake --build build
 }
 
 package() {
-    make DESTDIR="$pkgdir/" -C build install
+    DESTDIR="$pkgdir" cmake --install build
 }