summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordx-mon2020-11-18 17:46:00 +0000
committerdx-mon2020-11-18 18:00:44 +0000
commit9ffd4cd9c592f923cd5cb5d22732afc16dd04206 (patch)
tree8f98674a99f56a10b0fef627590308da9e1c0c38
parent6bb1158b5c237920aad67dad24e59f440f475713 (diff)
downloadaur-9ffd4cd9c592f923cd5cb5d22732afc16dd04206.tar.gz
Convert build system to Ninja
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD14
-rw-r--r--PKGBUILD.in14
3 files changed, 15 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f664866daf..5b9aaf359fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = kicad-nightly
makedepends = mesa
makedepends = boost
makedepends = swig
+ makedepends = ninja
depends = wxgtk3
depends = python
depends = boost-libs
diff --git a/PKGBUILD b/PKGBUILD
index 2690301319e..3dc749128ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('x86_64')
url='http://kicad-pcb.org/'
license=('GPL')
depends=('wxgtk3' 'python' 'boost-libs' 'glew' 'curl' 'glm' 'ngspice' 'opencascade' 'python-wxpython')
-makedepends=('git' 'cmake' 'zlib' 'mesa' 'boost' 'swig')
+makedepends=('git' 'cmake' 'zlib' 'mesa' 'boost' 'swig' 'ninja')
options=('!strip')
optdepends=(
'kicad-library-nightly: for footprints and symbols'
@@ -30,7 +30,7 @@ build()
mkdir build
cd build
- cmake .. \
+ cmake .. -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr/lib/kicad-nightly \
-DCMAKE_INSTALL_DATADIR=/usr/share/kicad-nightly \
@@ -48,23 +48,23 @@ build()
-DKICAD_DATA=/usr/share/kicad-nightly \
-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
-DBUILD_GITHUB_PLUGIN=ON
- make -j $(nproc)
+ ninja
cd "$srcdir/kicad-i18n"
mkdir build
cd build
- cmake .. \
+ cmake .. -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr/lib/kicad-nightly \
-DCMAKE_INSTALL_DATADIR=/usr/share/kicad-nightly \
-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/kicad-nightly
- make -j $(nproc)
+ ninja
}
package()
{
cd "$srcdir/kicad/build"
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja install
mkdir -p "$pkgdir/usr/share"
for prog in bitmap2component eeschema gerbview kicad pcbcalculator pcbnew; do
@@ -93,5 +93,5 @@ EOF
done
cd "$srcdir/kicad-i18n/build"
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja install
}
diff --git a/PKGBUILD.in b/PKGBUILD.in
index 85bb1e648d7..e395d20b55e 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -8,7 +8,7 @@ arch=('x86_64')
url='http://kicad-pcb.org/'
license=('GPL')
depends=('wxgtk3' 'python' 'boost-libs' 'glew' 'curl' 'glm' 'ngspice' 'opencascade' 'python-wxpython')
-makedepends=('git' 'cmake' 'zlib' 'mesa' 'boost' 'swig')
+makedepends=('git' 'cmake' 'zlib' 'mesa' 'boost' 'swig' 'ninja')
options=('!strip')
optdepends=(
'kicad-library-nightly: for footprints and symbols'
@@ -30,7 +30,7 @@ build()
mkdir build
cd build
- cmake .. \
+ cmake .. -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr/lib/kicad-nightly \
-DCMAKE_INSTALL_DATADIR=/usr/share/kicad-nightly \
@@ -48,23 +48,23 @@ build()
-DKICAD_DATA=/usr/share/kicad-nightly \
-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \
-DBUILD_GITHUB_PLUGIN=ON
- make -j $(nproc)
+ ninja
cd "$srcdir/kicad-i18n"
mkdir build
cd build
- cmake .. \
+ cmake .. -G Ninja \
-DCMAKE_INSTALL_PREFIX=/usr/lib/kicad-nightly \
-DCMAKE_INSTALL_DATADIR=/usr/share/kicad-nightly \
-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/kicad-nightly
- make -j $(nproc)
+ ninja
}
package()
{
cd "$srcdir/kicad/build"
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja install
mkdir -p "$pkgdir/usr/share"
for prog in bitmap2component eeschema gerbview kicad pcbcalculator pcbnew; do
@@ -93,5 +93,5 @@ EOF
done
cd "$srcdir/kicad-i18n/build"
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja install
}