From a6ff02d674ff3a33a632ca6d3901f851e0727707 Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 2 Mar 2020 11:33:17 -0300 Subject: main/gtest: modernize --- main/gtest/APKBUILD | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/main/gtest/APKBUILD b/main/gtest/APKBUILD index f4bf7a2941a..62d78346ef5 100644 --- a/main/gtest/APKBUILD +++ b/main/gtest/APKBUILD @@ -1,53 +1,44 @@ # Maintainer: Francesco Colista pkgname=gtest pkgver=1.10.0 -pkgrel=0 +pkgrel=1 pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)" url="https://github.com/google/googletest" arch="all" options="!check" # googletest-death-test-test hangs license="BSD-3-Clause" -depends="" -depends_dev="${pkgname}=${pkgver}-r${pkgrel} gmock=${pkgver}-r${pkgrel} cmake" +depends_dev="${pkgname}=$pkgver-r${pkgrel} gmock=$pkgver-r${pkgrel} cmake" makedepends="$depends_dev python3-dev" -install="" subpackages="$pkgname-dev gmock" source="$pkgname-$pkgver.tar.gz::https://github.com/google/googletest/archive/release-$pkgver.tar.gz gtest-1.8.1-libversion.patch gtest-1.8.1-null-pointer.patch" # https://src.fedoraproject.org/rpms/gtest/tree/master -builddir="$srcdir"/googletest-release-${pkgver} +builddir="$srcdir"/googletest-release-$pkgver prepare() { - cd "$builddir" # fixup version as they are never correct sed -E "s|(GOOGLETEST_VERSION) [0-9\\.]+|\\1 ${pkgver}|" -i CMakeLists.txt } build() { - cd "$builddir" - mkdir build - cd build - - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_SHARED_LIBS=ON \ - -DPYTHON_EXECUTABLE=python3 \ - -Dgtest_build_tests=ON \ - .. - make + cmake -B build . \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=ON \ + -DPYTHON_EXECUTABLE=python3 \ + -Dgtest_build_tests=ON + make -C build } check() { - cd "$builddir"/build - make test + make -C build test } package() { - cd "$builddir" - - DESTDIR="${pkgdir}" cmake --build build --target install - find "${pkgdir}" -name '*.pump' -print -delete + make -C build DESTDIR="$pkgdir" install + find "$pkgdir" -name '*.pump' -print -delete } gmock() { -- cgit v1.2.3