ENABLE_CXX_STD=C++14 and add check

This commit is contained in:
Greyson Christoforo 2020-12-17 14:44:44 +00:00
parent a830603091
commit 58a7afc460
2 changed files with 8 additions and 6 deletions

View file

@ -1,6 +1,6 @@
pkgbase = freecad-git pkgbase = freecad-git
pkgdesc = A general purpose 3D CAD modeler - git checkout pkgdesc = A general purpose 3D CAD modeler - git checkout
pkgver = 0.19_pre.r4408.g20649ec529 pkgver = 0.19_pre.r4724.g6c6f5e7fbf
pkgrel = 1 pkgrel = 1
epoch = 0 epoch = 0
url = https://www.freecadweb.org/ url = https://www.freecadweb.org/

View file

@ -2,7 +2,7 @@
# Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com> # Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
pkgname=freecad-git pkgname=freecad-git
pkgver=0.19_pre.r4408.g20649ec529 pkgver=0.19_pre.r4724.g6c6f5e7fbf
pkgrel=1 pkgrel=1
epoch=0 epoch=0
pkgdesc='A general purpose 3D CAD modeler - git checkout' pkgdesc='A general purpose 3D CAD modeler - git checkout'
@ -59,12 +59,10 @@ prepare() {
# patch out a build error # patch out a build error
#curl -L "https://github.com/FreeCAD/FreeCAD/pull/2842/commits/095984fce44931a4c8e2ace269d45a62640fbfb4.patch" | patch -p1 #curl -L "https://github.com/FreeCAD/FreeCAD/pull/2842/commits/095984fce44931a4c8e2ace269d45a62640fbfb4.patch" | patch -p1
# OpenCascade requires that /bin comes before /usr/bin in $PATH (no longer needed?)
#export PATH="/usr/bin:$PATH"
mkdir -p build mkdir -p build
cd build cd build
cmake -Wno-dev .. \ cmake -Wno-dev .. \
-D BUILD_ENABLE_CXX_STD=C++14 \
-D BUILD_QT5=ON \ -D BUILD_QT5=ON \
-D CMAKE_BUILD_TYPE=Release \ -D CMAKE_BUILD_TYPE=Release \
-D CMAKE_C_FLAGS="${CFLAGS} -fPIC -w" \ -D CMAKE_C_FLAGS="${CFLAGS} -fPIC -w" \
@ -84,6 +82,11 @@ build() {
ninja -C build ninja -C build
} }
check() {
cd FreeCAD
./build/bin/FreeCAD --console --run-test 0
}
package() { package() {
cd FreeCAD cd FreeCAD
DESTDIR="${pkgdir}" ninja -C build install DESTDIR="${pkgdir}" ninja -C build install
@ -109,7 +112,6 @@ package() {
install -Dm644 freecad.svg \ install -Dm644 freecad.svg \
"${pkgdir}/usr/share/icons/hicolor/scalable/apps/freecad.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/freecad.svg"
# Package symlinks in /usr/bin # Package symlinks in /usr/bin
install -d "${pkgdir}/usr/bin" install -d "${pkgdir}/usr/bin"
ln -sf /usr/lib/freecad/bin/FreeCAD "${pkgdir}/usr/bin/freecad" ln -sf /usr/lib/freecad/bin/FreeCAD "${pkgdir}/usr/bin/freecad"