From 77791e142c1f2fc3af0c805225f5450d65e53b3b Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Thu, 17 Oct 2019 16:03:12 +0200 Subject: [PATCH] more on build scripts --- misc/PKGBUILD | 6 +++--- src/core/meson.build | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/misc/PKGBUILD b/misc/PKGBUILD index af5389c..f679f03 100644 --- a/misc/PKGBUILD +++ b/misc/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Martin Brodbeck pkgname=kima2 -pkgver=1.1.0 +pkgver=1.5.0 pkgrel=1 pkgdesc="A small cash point program for children's things markets (German only)" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ license=('custom') depends=('glibc' 'libusb' 'qt5-base' 'sqlite3' 'xlnt') makedepends=('boost>=1.62') source=($pkgname-$pkgver.tar.gz) -md5sums=('') +md5sums=('c0e6a64b5037675edce4ba8bc4639bd3') build() { if [ ! -d $pkgname/build ]; then @@ -17,7 +17,7 @@ build() { fi cd $pkgname/build - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DKIMA2_USE_EXTERNAL_JSON=ON .. + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DKIMA2_USE_EXTERNAL_JSON=OFF .. make } diff --git a/src/core/meson.build b/src/core/meson.build index a2923b9..b54f484 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -1,4 +1,4 @@ -boost = dependency('boost', modules :['date_time']) +boost = dependency('boost', modules: ['date_time'], static: true) xlnt = dependency('xlnt') sqlite = dependency('sqlite3') @@ -8,6 +8,6 @@ src = ['database.cpp', 'entity.cpp', 'entityint.cpp', 'entityuuid.cpp', core_inc = include_directories('..') -core_lib = static_library('core', src, dependencies :[boost, xlnt, sqlite, nlohmann_lib, csv_dep]) +core_lib = static_library('core', src, dependencies: [boost, xlnt, sqlite, nlohmann_lib, csv_dep]) -core_dep = declare_dependency(link_with : core_lib, include_directories : core_inc) +core_dep = declare_dependency(link_with: core_lib, include_directories : core_inc)