use ninja instead of make where possible

spatial-model-editor · Apr 10, 2024 · 7435ac1 · 7435ac1
1 parent fd87292
commit 7435ac1
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ This repo provides the following statically compiled libraries:
 
 Get the latest versions here:
 
-- linux (clang 17 / Ubuntu 20.04): [sme_deps_common_linux.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_linux.tgz)
+- linux (clang 18 / Ubuntu 20.04): [sme_deps_common_linux.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_linux.tgz)
 - osx (Xcode 14.3 / macOS 13): [sme_deps_common_osx.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_osx.tgz)
 - win64-mingw (mingw-w64-x86_64-gcc 13): [sme_deps_common_win64-mingw.tgz](https://github.com/spatial-model-editor/sme_deps_common/releases/latest/download/sme_deps_common_win64-mingw.tgz)
 

diff --git a/build.sh b/build.sh
@@ -73,11 +73,11 @@ git clone -b $FUNCTION2_VERSION --depth 1 https://github.com/Naios/function2.git
 cd function2
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_TESTING=OFF \
     -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX"
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of bzip2
@@ -96,10 +96,10 @@ git clone -b $CEREAL_VERSION --depth 1 https://github.com/USCiLab/cereal.git
 cd cereal
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
     -DJUST_INSTALL_CEREAL=ON
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of QCustomPlot (using our own cmakelists)
@@ -109,7 +109,7 @@ cp qcustomplot-source/* qcustomplot/.
 cd qcustomplot
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -119,8 +119,8 @@ cmake -G "Unix Makefiles" .. \
     -DZLIB_INCLUDE_DIR=${INSTALL_PREFIX}/include \
     -DZLIB_LIBRARY_RELEASE=${INSTALL_PREFIX}/lib/libz.a \
     -DWITH_QT6=ON
-time make -j$NPROCS
-${SUDO_CMD} make install
+time ninja
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of boost serialization & install headers
@@ -136,7 +136,7 @@ git clone -b $BENCHMARK_VERSION --depth 1 https://github.com/google/benchmark.gi
 cd benchmark
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -145,17 +145,17 @@ cmake -G "Unix Makefiles" .. \
     -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
     -DBENCHMARK_ENABLE_WERROR=OFF \
     -DBENCHMARK_ENABLE_TESTING=OFF
-time make -j$NPROCS
+time ninja
 #make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of Catch2 library
 git clone -b $CATCH2_VERSION --depth 1 https://github.com/catchorg/Catch2.git
 cd Catch2
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -165,17 +165,17 @@ cmake -G "Unix Makefiles" .. \
     -DBUILD_SHARED_LIBS=OFF \
     -DCATCH_INSTALL_DOCS=OFF \
     -DCATCH_INSTALL_EXTRAS=ON
-time make -j$NPROCS
+time ninja
 #make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of opencv library
 git clone -b $OPENCV_VERSION --depth 1 https://github.com/opencv/opencv.git
 cd opencv
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -286,9 +286,9 @@ cmake -G "Unix Makefiles" .. \
     -DWITH_XINE:BOOL=OFF \
     -DZLIB_INCLUDE_DIR=$INSTALL_PREFIX/include \
     -DZLIB_LIBRARY_RELEASE=$INSTALL_PREFIX/lib/libz.a
-time make -j$NPROCS
+time ninja
 #make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of oneTBB
@@ -298,7 +298,7 @@ git clone -b $TBB_VERSION --depth 1 https://github.com/lkeegan/oneTBB.git
 cd oneTBB
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -308,17 +308,17 @@ cmake -G "Unix Makefiles" .. \
     -DTBB_ENABLE_IPO="$TBB_ENABLE_IPO" \
     -DTBB_STRICT=OFF \
     -DTBB_TEST=OFF
-VERBOSE=1 time make tbb -j$NPROCS
+VERBOSE=1 time ninja tbb
 #time make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of oneDPL
 git clone -b $DPL_VERSION --depth 1 https://github.com/oneapi-src/oneDPL
 cd oneDPL
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -328,15 +328,15 @@ cmake -G "Unix Makefiles" .. \
     -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
     -DONEDPL_BACKEND="tbb"
 make
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of pagmo
 git clone -b $PAGMO_VERSION --depth 1 https://github.com/esa/pagmo2.git
 cd pagmo2
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -346,17 +346,17 @@ cmake -G "Unix Makefiles" .. \
     -DCMAKE_PREFIX_PATH="$INSTALL_PREFIX" \
     -DPAGMO_BUILD_STATIC_LIBRARY=ON \
     -DPAGMO_BUILD_TESTS=OFF
-VERBOSE=1 time make -j$NPROCS
+VERBOSE=1 time ninja
 #time make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of expat xml library
 git clone -b $LIBEXPAT_VERSION --depth 1 https://github.com/libexpat/libexpat.git
 cd libexpat
 mkdir build
 cd build
-cmake -G "Unix Makefiles" ../expat \
+cmake -GNinja ../expat \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -368,9 +368,9 @@ cmake -G "Unix Makefiles" ../expat \
     -DEXPAT_BUILD_TOOLS=OFF \
     -DEXPAT_SHARED_LIBS=OFF \
     -DEXPAT_BUILD_TESTS:BOOL=OFF
-time make -j$NPROCS
+time ninja
 #make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of libSBML including spatial extension
@@ -379,7 +379,7 @@ cd libsbml
 git status
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -402,8 +402,8 @@ cmake -G "Unix Makefiles" .. \
     -DWITH_EXPAT=ON \
     -DEXPAT_INCLUDE_DIR=$INSTALL_PREFIX/include \
     -DEXPAT_LIBRARY=$INSTALL_PREFIX/lib/libexpat.a
-time make -j$NPROCS
-${SUDO_CMD} make install
+time ninja
+${SUDO_CMD} ninja install
 cd ../../
 
 # libCombine
@@ -416,7 +416,7 @@ git checkout $ZIPPER_VERSION
 cd ../../
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -429,17 +429,17 @@ cmake -G "Unix Makefiles" .. \
     -DEXTRA_LIBS="$BOOST_INSTALL_PREFIX/lib/libz.a;$BOOST_INSTALL_PREFIX/lib/libbz2.a;$BOOST_INSTALL_PREFIX/lib/libexpat.a" \
     -DZLIB_INCLUDE_DIR=$BOOST_INSTALL_PREFIX/include \
     -DZLIB_LIBRARY=$BOOST_INSTALL_PREFIX/lib/libz.a
-time make -j$NPROCS
-make test
-${SUDO_CMD} make install
+time ninja
+#ninja test
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of fmt
 git clone -b $FMT_VERSION --depth 1 https://github.com/fmtlib/fmt.git
 cd fmt
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -449,9 +449,9 @@ cmake -G "Unix Makefiles" .. \
     -DCMAKE_CXX_STANDARD=17 \
     -DFMT_DOC=OFF \
     -DFMT_TEST:BOOL=OFF
-time make -j$NPROCS
+time ninja
 #make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of libTIFF
@@ -462,7 +462,7 @@ cd libtiff
 git apply --ignore-space-change --ignore-whitespace --verbose ../libtiff.diff
 mkdir cmake-build
 cd cmake-build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -482,17 +482,17 @@ cmake -G "Unix Makefiles" .. \
     -Dzlib=OFF \
     -DGLUT_INCLUDE_DIR=GLUT_INCLUDE_DIR-NOTFOUND \
     -DOPENGL_INCLUDE_DIR=OPENGL_INCLUDE_DIR-NOTFOUND
-time make -j$NPROCS
+time ninja
 #make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of spdlog
 git clone -b $SPDLOG_VERSION --depth 1 https://github.com/gabime/spdlog.git
 cd spdlog
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -505,9 +505,9 @@ cmake -G "Unix Makefiles" .. \
     -DSPDLOG_NO_THREAD_ID=ON \
     -DSPDLOG_NO_ATOMIC_LEVELS=ON \
     -DCMAKE_PREFIX_PATH=$INSTALL_PREFIX
-time make -j$NPROCS
+time ninja
 #make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of gmp
@@ -553,7 +553,7 @@ git clone -b $CGAL_VERSION --depth 1 https://github.com/CGAL/cgal.git
 cd cgal
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -562,15 +562,15 @@ cmake -G "Unix Makefiles" .. \
     -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX" \
     -DWITH_CGAL_ImageIO=OFF \
     -DWITH_CGAL_Qt5=OFF
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build static version of symengine
 git clone -b $SYMENGINE_VERSION --depth 1 https://github.com/symengine/symengine.git
 cd symengine
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -586,17 +586,17 @@ cmake -G "Unix Makefiles" .. \
     -DWITH_SYSTEM_CEREAL=ON \
     -DWITH_SYMENGINE_THREAD_SAFE=ON \
     -DBUILD_TESTS=OFF
-time make -j$NPROCS
+time ninja
 #time make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # build minimal static version of VTK including GUISupportQt module
 git clone -b $VTK_VERSION --depth 1 https://github.com/Kitware/VTK.git
 cd VTK
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -626,9 +626,9 @@ cmake -G "Unix Makefiles" .. \
     -DVTK_USE_MPI=OFF \
     -DVTK_ENABLE_WRAPPING=OFF \
     ${VTK_OPTIONS}
-time make -j$NPROCS
+time ninja
 #make test
-${SUDO_CMD} make install
+${SUDO_CMD} ninja install
 cd ../../
 
 # Scotch (includes METIS compatibility library)
@@ -637,7 +637,7 @@ cd scotch
 git apply --ignore-space-change --ignore-whitespace --verbose ../scotch.diff
 mkdir build
 cd build
-cmake -G "Unix Makefiles" .. \
+cmake -GNinja .. \
     -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_SHARED_LIBS=OFF \
@@ -654,8 +654,8 @@ cmake -G "Unix Makefiles" .. \
     -DUSE_BZ2=ON \
     -DBZIP2_INCLUDE_DIR=$INSTALL_PREFIX/include \
     -DBZIP2_LIBRARY_RELEASE=$INSTALL_PREFIX/lib/libbz2.a
-time make -j$NPROCS
-${SUDO_CMD} make install
+time ninja
+${SUDO_CMD} ninja install
 cd ../../
 
 mkdir artefacts