diff --git a/mingw-w64-catch/PKGBUILD b/mingw-w64-catch/PKGBUILD index 0b70573b90..c36a90d691 100644 --- a/mingw-w64-catch/PKGBUILD +++ b/mingw-w64-catch/PKGBUILD @@ -7,10 +7,11 @@ pkgver=2.13.8 pkgrel=1 pkgdesc="A modern, C++-native, header-only, test framework for unit-tests, TDD and BDD using C++11 and later (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url='https://github.com/catchorg/Catch2' makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-python") license=('custom') source=(${_realname}-${pkgver}.tar.gz::https://github.com/catchorg/Catch2/archive/v${pkgver}.tar.gz) @@ -28,12 +29,12 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ - -G"MSYS Makefiles" \ + -G"Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ "../Catch2-${pkgver}" - make + ${MINGW_PREFIX}/bin/cmake.exe --build ./ } check() { @@ -43,7 +44,7 @@ check() { package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR=${pkgdir} install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./ install -Dm644 ${srcdir}/Catch2-${pkgver}/LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.txt" }