diff options
| author | Benjamin Trigona-Harany <bosth@alumni.sfu.ca> | 2017-03-24 12:55:22 -0700 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2017-03-25 00:08:33 +0000 |
| commit | 608f45bfe3059c6b4a27bd7d1c92088f2090aeb6 (patch) | |
| tree | 71c4b78e73b32ca26f881b0e8a0d1db52dcbc8fe /gis/qgis/qgis.SlackBuild | |
| parent | 59bc343549b127b7c75135f356a2e08a804e9707 (diff) | |
| download | slackbuilds-608f45bfe3059c6b4a27bd7d1c92088f2090aeb6.tar.xz | |
gis/qgis: Updated for version 2.18.5.
Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
Diffstat (limited to 'gis/qgis/qgis.SlackBuild')
| -rwxr-xr-x[-rw-r--r--] | gis/qgis/qgis.SlackBuild | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild index 1b6bd785c6ad..0de4b5e79dfd 100644..100755 --- a/gis/qgis/qgis.SlackBuild +++ b/gis/qgis/qgis.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qgis -VERSION=${VERSION:-2.18.4} +VERSION=${VERSION:-2.18.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,6 +81,11 @@ if [ "${SERVER:-no}" = "yes" ]; then WITHSERVER="-DWITH_SERVER=TRUE -DQGIS_CGIBIN_SUBDIR=$CGIBINDIR" fi +WITHNINJA="" +if [ "${NINJA:-no}" = "yes" ]; then + WITHNINJA="-GNinja" +fi + # fix double qjson target patch -p1 < $CWD/qjson.cmake.diff @@ -91,7 +96,6 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \ -DQGIS_LIB_SUBDIR=lib${LIBDIRSUFFIX} \ -DQGIS_LIBEXEC_SUBDIR=lib${LIBDIRSUFFIX}/qgis \ -DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \ @@ -99,8 +103,14 @@ cd build -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \ -DENABLE_TESTS=FALSE \ $WITHSERVER \ - $WITHGRASS - make install DESTDIR=$PKG + $WITHGRASS \ + $WITHNINJA + + if [ -z "$WITHNINJA" ]; then + make install DESTDIR=$PKG + else + DESTDIR=$PKG ninja install + fi cd - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ |