diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 18 |
2 files changed, 12 insertions, 18 deletions
@@ -1,15 +1,15 @@ -pkgbase = ros-melodic-cmake-modules +pkgbase = ros-noetic-cmake-modules pkgdesc = ROS - A common repository for CMake Modules which are not distributed with CMake but are commonly used by ROS packages. - pkgver = 0.4.2 + pkgver = 0.5.0 pkgrel = 1 url = https://wiki.ros.org/cmake_modules arch = any license = BSD makedepends = cmake makedepends = ros-build-tools - makedepends = ros-melodic-catkin - source = ros-melodic-cmake-modules-0.4.2.tar.gz::https://github.com/ros/cmake_modules/archive/0.4.2.tar.gz - sha256sums = f127c91d5fed5b6fdcc4ae784702a5a10a9073e4893f60a703d263cf8342b64f + makedepends = ros-noetic-catkin + source = ros-noetic-cmake-modules-0.5.0.tar.gz::https://github.com/ros/cmake_modules/archive/0.5.0.tar.gz + sha256sums = SKIP -pkgname = ros-melodic-cmake-modules +pkgname = ros-noetic-cmake-modules @@ -3,14 +3,14 @@ pkgdesc="ROS - A common repository for CMake Modules which are not distributed with CMake but are commonly used by ROS packages." url='https://wiki.ros.org/cmake_modules' -pkgname='ros-melodic-cmake-modules' -pkgver='0.4.2' +pkgname='ros-noetic-cmake-modules' +pkgver='0.5.0' arch=('any') pkgrel=1 license=('BSD') ros_makedepends=( - ros-melodic-catkin + ros-noetic-catkin ) makedepends=( @@ -28,29 +28,23 @@ depends=( _dir="cmake_modules-${pkgver}" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/cmake_modules/archive/${pkgver}.tar.gz") -sha256sums=('f127c91d5fed5b6fdcc4ae784702a5a10a9073e4893f60a703d263cf8342b64f') +sha256sums=('SKIP') 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 the 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 3 ${srcdir}/${_dir} - # Build the 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/python3 \ - -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \ - -DPYTHON_BASENAME=.cpython-37m \ -DSETUPTOOLS_DEB_LAYOUT=OFF make } |