[arch-commits] Commit in gtest/trunk (PKGBUILD)

[Jan Steffens]

    Date: Tuesday, March 26, 2019 @ 09:01:18
  Author: heftig
Revision: 443544

Simplify build

Modified:
  gtest/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-26 08:55:59 UTC (rev 443543)
+++ PKGBUILD	2019-03-26 09:01:18 UTC (rev 443544)
@@ -13,7 +13,7 @@
 url='https://github.com/google/googletest'
 arch=('x86_64')
 license=('BSD')
-makedepends=('python2' 'cmake' 'gcc-libs' 'sh' 'ninja')
+makedepends=('python2' 'cmake' 'gcc-libs' 'sh')
 _srcname=googletest-release-${pkgver}
 source=(${_srcname}.tar.gz::https://github.com/google/googletest/archive/release-${pkgver}.tar.gz
         gtest-1.8.1-libversion.patch
@@ -39,19 +39,16 @@
 }
 
 build() {
-  mkdir build build-ac
-  cd build
-
-  cmake -G Ninja ../${_srcname} \
+  cmake -H${_srcname} -Bbuild \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DBUILD_SHARED_LIBS=ON \
     -DPython_ADDITIONAL_VERSIONS=2.7 \
     -Dgtest_build_tests=ON
-  cmake --build .
+  cmake --build build
 
   # Only for g{test,mock}-config
-  cd ../${_srcname}/googletest
+  cd ${_srcname}/googletest
   autoreconf -fvi
   ./configure --prefix=/usr
   cd ../googlemock