upd to noetic, cmake vars, python

1 files changed, 12 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index cfec1ad6a497..8c91f2912001 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,28 @@
 pkgdesc="ROS - The tuw_msgs meta package."
 url='https://wiki.ros.org/tuw_msgs'
 
-pkgname='ros-melodic-tuw-msgs'
+pkgname='ros-noetic-tuw-msgs'
 pkgver='0.0.13'
 _pkgver_patch=0
 arch=('any')
 pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-tuw-airskin-msgs
-  ros-melodic-tuw-vehicle-msgs
-  ros-melodic-tuw-nav-msgs
-  ros-melodic-tuw-object-msgs
-  ros-melodic-tuw-gazebo-msgs
-  ros-melodic-tuw-multi-robot-msgs
-  ros-melodic-tuw-geometry-msgs)
+ros_depends=(ros-noetic-tuw-airskin-msgs
+  ros-noetic-tuw-vehicle-msgs
+  ros-noetic-tuw-nav-msgs
+  ros-noetic-tuw-object-msgs
+  ros-noetic-tuw-gazebo-msgs
+  ros-noetic-tuw-multi-robot-msgs
+  ros-noetic-tuw-geometry-msgs)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/tuw_msgs/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/tuw_msgs/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/tuw-robotics/tuw_msgs-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -37,24 +37,17 @@ sha256sums=('b22f12be8014a8855cd179d228ae5312102da4b3d176979f66f13e258cc418b6')
 build() {
   # Use ROS environment variables
   source /usr/share/ros-build-tools/clear-ros-env.sh
-  [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+  [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
   # Create build directory
   [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
   cd ${srcdir}/build
 
-  # Fix Python2/Python3 conflicts
-  /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
-
   # Build project
   cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
         -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-        -DPYTHON_BASENAME=-python2.7 \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }