summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2020-11-04 14:31:19 +0100
committerMartchus2020-11-04 14:40:28 +0100
commit9e43478fa38c11ee99623ccec1d316cc71b0db73 (patch)
treed95a057e7288032690de35d22738abdc8c69e5fa
parentef519693508b4154546440e26b3e6d71e855422f (diff)
downloadaur-mingw-w64-reflective-rapidjson.tar.gz
Use ninja
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD12
2 files changed, 8 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dbf26265468..185c2f6bafa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = mingw-w64-reflective-rapidjson
checkdepends = mingw-w64-boost
makedepends = mingw-w64-gcc
makedepends = mingw-w64-cmake
+ makedepends = ninja
depends = mingw-w64-crt
depends = mingw-w64-c++utilities
depends = mingw-w64-rapidjson
diff --git a/PKGBUILD b/PKGBUILD
index 4e4efeb5723..1df515068b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ depends=('mingw-w64-crt' 'mingw-w64-c++utilities' 'mingw-w64-rapidjson' 'reflect
optdepends=("mingw-w64-boost: use Boost.Hana instead of code generator"
"$_name-doc: API documentation")
checkdepends=('mingw-w64-cppunit' 'mingw-w64-wine' 'mingw-w64-boost')
-makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
+makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'ninja')
url="https://github.com/Martchus/${_reponame}"
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('1e253ca0c63c6432ede1b1d7ad6c828b93eeb47eb1843d7bdc09445be7c1bba6')
@@ -46,15 +46,16 @@ build() {
msg2 "${_arch}-${_cfg}"
mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}"
${_arch}-cmake \
+ -G Ninja \
-DCMAKE_BUILD_TYPE:STRING='Release' \
-DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \
-DCONFIGURATION_NAME:STRING="${_cfg}" \
-DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \
-DNO_GENERATOR:BOOL=ON \
- -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \
+ -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \
${_config_flags[$_cfg]} \
../
- make
+ ninja
popd
done
done
@@ -67,7 +68,8 @@ check() {
for _cfg in "${_configurations[@]}"; do
msg2 "${_arch}-${_cfg}"
pushd "build-${_arch}-${_cfg}"
- make WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all check
+ export WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all
+ ninja check
popd
done
done
@@ -80,7 +82,7 @@ package() {
for _cfg in "${_configurations[@]}"; do
msg2 "${_arch}-${_cfg}"
pushd "build-${_arch}-${_cfg}"
- make DESTDIR="${pkgdir}" install-mingw-w64-strip
+ DESTDIR="${pkgdir}" ninja install-mingw-w64-strip
popd
done
done