Date: Saturday, March 31, 2018 @ 20:46:44 Author: zorun Revision: 313632
upgpkg: restbed 4.6+24+gb1f0182-2 restbed: enable unit tests Added: restbed/trunk/fix-cmake-catch-include.patch Modified: restbed/trunk/PKGBUILD -------------------------------+ PKGBUILD | 22 ++++++++++++++++++---- fix-cmake-catch-include.patch | 12 ++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-03-31 20:25:27 UTC (rev 313631) +++ PKGBUILD 2018-03-31 20:46:44 UTC (rev 313632) @@ -2,7 +2,7 @@ # Contributor: Justin Wilcox <nat1192 at gmail dot com> pkgname=restbed pkgver=4.6+24+gb1f0182 -pkgrel=1 +pkgrel=2 pkgdesc="A framework for asynchronous RESTful functionality in C++11 applications" arch=('x86_64') url="https://github.com/Corvusoft/restbed" @@ -11,10 +11,18 @@ replaces=('restbed-latest') conflicts=('restbed-latest') makedepends=('cmake' 'asio' 'kashmir') +checkdepends=('catch2') _commit=b1f0182c0ea74ea5e6dc08fd540462422fd0dc7f -source=("https://github.com/Corvusoft/restbed/archive/${_commit}/$pkgname-$pkgver.tar.gz") -sha256sums=('fb7ee67eb36eb1297e18f6ada4ba3a6fa255a6c64ff4e70a1efef5ef76c484c9') +source=("https://github.com/Corvusoft/restbed/archive/${_commit}/$pkgname-$pkgver.tar.gz" + "fix-cmake-catch-include.patch") +sha256sums=('fb7ee67eb36eb1297e18f6ada4ba3a6fa255a6c64ff4e70a1efef5ef76c484c9' + '9f0de7baf90cb00c02ba27fff893a4d343c46a729f85817871b71cc8f3533790') +prepare() { + cd "$srcdir/$pkgname-$_commit" + patch -p1 < "$srcdir/fix-cmake-catch-include.patch" +} + build() { cd "$srcdir/$pkgname-$_commit" @@ -24,10 +32,16 @@ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED=on \ - -DBUILD_SSL=on + -DBUILD_SSL=on \ + -DBUILD_TESTS=on make } +check() { + cd "$srcdir/$pkgname-$_commit/build" + make test +} + package() { cd "$srcdir/$pkgname-$_commit" Added: fix-cmake-catch-include.patch =================================================================== --- fix-cmake-catch-include.patch (rev 0) +++ fix-cmake-catch-include.patch 2018-03-31 20:46:44 UTC (rev 313632) @@ -0,0 +1,12 @@ +diff --git a/cmake/modules/Findcatch.cmake b/cmake/modules/Findcatch.cmake +index eff91fe..15c7f87 100644 +--- a/cmake/modules/Findcatch.cmake ++++ b/cmake/modules/Findcatch.cmake +@@ -1,6 +1,6 @@ + # Copyright 2013-2017, Corvusoft Ltd, All Rights Reserved. + +-find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/include" "/usr/include" "/usr/local/include" "/opt/local/include" ) ++find_path( catch_INCLUDE catch.hpp HINTS "${PROJECT_SOURCE_DIR}/dependency/catch/include" "/usr/include" "/usr/include/catch" "/usr/local/include" "/opt/local/include" ) + + if ( catch_INCLUDE ) + set( CATCH_FOUND TRUE )