aboutsummaryrefslogtreecommitdiff
path: root/travis
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-04-28 21:54:41 +0200
committerEven Rouault <even.rouault@spatialys.com>2019-04-28 21:54:41 +0200
commit0fc0c6d8d535fcbf8b7c72d5a6c22c9daa780d49 (patch)
treeb4664c8a8f3200b87c1b6a06e0a993df1e09277d /travis
parentc3c1efedbeae11a09947f2873fe97e50afa87b29 (diff)
downloadPROJ-0fc0c6d8d535fcbf8b7c72d5a6c22c9daa780d49.tar.gz
PROJ-0fc0c6d8d535fcbf8b7c72d5a6c22c9daa780d49.zip
travis/install.sh: use make -j$(nproc)
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/install.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/travis/install.sh b/travis/install.sh
index c8da9046..950ed45f 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -27,7 +27,7 @@ if [ -f /usr/lib/jvm/java-7-openjdk-amd64/include/jni.h ]; then
else
../configure --prefix=/tmp/proj_autoconf_install_from_dist_all
fi
-make -j2
+make -j$(nproc)
make check
make install
find /tmp/proj_autoconf_install_from_dist_all
@@ -37,7 +37,7 @@ cd ..
mkdir build_cmake
cd build_cmake
cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/proj_cmake_install
-VERBOSE=1 make -j2
+VERBOSE=1 make -j$(nproc)
make install
# The cmake build is not able to generate the null file, so copy it at hand
cp /tmp/proj_autoconf_install_from_dist_all/share/proj/null /tmp/proj_cmake_install/share/proj
@@ -55,7 +55,7 @@ cd ../..
mkdir build_autoconf_grids
cd build_autoconf_grids
../configure --prefix=/tmp/proj_autoconf_install_grids
-make -j2
+make -j$(nproc)
make check
(cd src && make multistresstest && make test228)
PROJ_LIB=../data src/multistresstest
@@ -74,7 +74,7 @@ if [ "$BUILD_NAME" != "linux_clang" ]; then
else
./configure
fi
-make -j2
+make -j$(nproc)
make check
# Rerun tests without grids not included in proj-datumgrid