diff options
| author | Martchus | 2020-10-11 15:05:49 +0200 |
|---|---|---|
| committer | Martchus | 2020-10-11 15:05:49 +0200 |
| commit | 91f7daefb3bd28f5893fdc6c9dbd22329cc023d2 (patch) | |
| tree | ed341938de80b2474883f27c9c85d33605ac6e31 | |
| parent | c8197f2099da5070ebd441b448f066b1ee593ba0 (diff) | |
| download | aur-91f7daefb3bd28f5893fdc6c9dbd22329cc023d2.tar.gz | |
Use ninja
| -rw-r--r-- | .SRCINFO | 1 | ||||
| -rw-r--r-- | PKGBUILD | 13 |
2 files changed, 8 insertions, 6 deletions
@@ -13,6 +13,7 @@ pkgbase = syncthingtray-git checkdepends = syncthing checkdepends = iproute2 makedepends = cmake + makedepends = ninja makedepends = qt5-tools makedepends = git makedepends = mesa @@ -38,7 +38,7 @@ depends=('qtutilities-git' 'qt5-svg' 'openssl' 'desktop-file-utils' 'xdg-utils') [[ $_js_provider == qml ]] && depends+=('qt5-declarative') [[ $_enable_kio_plugin ]] && optdepends+=('kio: KIO plugin for Syncthing actions in Dolphin') [[ $_enable_plasmoid ]] && optdepends+=('plasma-workspace: Plasmoid for Plasma 5 desktop') -makedepends=('cmake' 'qt5-tools' 'git' 'mesa') +makedepends=('cmake' 'ninja' 'qt5-tools' 'git' 'mesa') checkdepends=('cppunit' 'syncthing' 'iproute2') [[ $_enable_kio_plugin ]] && makedepends+=('kio') [[ $_enable_plasmoid ]] && makedepends+=('plasma-framework' 'extra-cmake-modules') @@ -65,6 +65,7 @@ build() { [[ $_enable_plasmoid ]] || additional_args+=' -DNO_PLASMOID=ON' cmake \ + -G Ninja \ -DCMAKE_BUILD_TYPE:STRING='Release' \ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ -DCONFIGURATION_NAME:STRING='git' \ @@ -72,23 +73,23 @@ build() { -DLIB_SYNCTHING_CONNECTOR_CONFIGURATION_TARGET_SUFFIX:STRING='git' \ -DSYNCTHINGFILEITEMACTION_CONFIGURATION_TARGET_SUFFIX:STRING='git' \ -DLIB_SYNCTHING_MODEL_CONFIGURATION_TARGET_SUFFIX:STRING='git' \ - -DSYNCTHINGPLASMOID_TARGET_SUFFIX:STRING='git' \ - -DSYNCTHINGWIDGETS_TARGET_SUFFIX:STRING='git' \ + -DSYNCTHINGPLASMOID_CONFIGURATION_TARGET_SUFFIX:STRING='git' \ + -DSYNCTHINGWIDGETS_CONFIGURATION_TARGET_SUFFIX:STRING='git' \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DWEBVIEW_PROVIDER="${_webview_provider}" \ -DJS_PROVIDER="${_js_provider}" \ -DSYSTEMD_SUPPORT=ON \ $additional_args \ . - make + ninja } check() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}" - make SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 check + SYNCTHING_PORT=$(ephemeral_port) SYNCTHING_TEST_TIMEOUT_FACTOR=3 ninja check } package() { cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame}" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja install } |