Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
travis/install.sh: use make -j$(nproc)
  • Loading branch information
rouault committed Apr 28, 2019
1 parent c3c1efe commit 0fc0c6d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions travis/install.sh
Expand Up @@ -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
Expand 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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 0fc0c6d

Please sign in to comment.