configurable dependency build thread count

Author: calccrypto

CMakeLists.txt

@@ -225,11 +225,12 @@ pkg_search_module(PCRE REQUIRED libpcre)
 set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES}")
 
 # Download and build all non-system dependencies
-set(DEP_DOWNLOAD_PREFIX "${CMAKE_SOURCE_DIR}/contrib/deps" CACHE PATH "Location of dependency sources")
-set(DEP_BUILD_PREFIX    "${CMAKE_BINARY_DIR}/builds"       CACHE PATH "Location of dependency builds")
-set(DEP_INSTALL_PREFIX  "${CMAKE_BINARY_DIR}/deps"         CACHE PATH "Location of dependency binaries")
-set(CLIENT              OFF                                CACHE BOOL "Whether or not to build and install client")
-set(DEP_OPTIONS "")
+set(DEP_DOWNLOAD_PREFIX "${CMAKE_SOURCE_DIR}/contrib/deps" CACHE PATH   "Location of dependency sources")
+set(DEP_BUILD_PREFIX    "${CMAKE_BINARY_DIR}/builds"       CACHE PATH   "Location of dependency builds")
+set(DEP_BUILD_THREADS   "1"                                CACHE STRING "Number of build threads")
+set(DEP_INSTALL_PREFIX  "${CMAKE_BINARY_DIR}/deps"         CACHE PATH   "Location of dependency binaries")
+set(CLIENT              OFF                                CACHE BOOL   "Whether or not to build and install client")
+set(DEP_OPTIONS --threads "${DEP_BUILD_THREADS}")
 if (CMAKE_CXX_COMPILER)
   set(DEP_OPTIONS ${DEP_OPTIONS} --cxx)
 endif()

contrib/deps/googletest.sh

@@ -8,7 +8,7 @@ set -e
 googletest_name="googletest"
 googletest_prefix="${INSTALL_DIR}/${googletest_name}"
 if [[ ! -d "${googletest_prefix}" ]]; then
-    googletest_build="${BUILD_DIR}/googletest-master"
+    googletest_build="${BUILD_DIR}/googletest-main"
     if [[ ! -d "${googletest_build}" ]]; then
         googletest_tarball="${DOWNLOAD_DIR}/googletest.tar.gz"
         if [[ ! -f "${googletest_tarball}" ]]; then
@@ -24,6 +24,6 @@ if [[ ! -d "${googletest_prefix}" ]]; then
     if [[ ! -f Makefile ]]; then
         $CMAKE .. -DCMAKE_INSTALL_PREFIX="${googletest_prefix}" -DBUILD_GMOCK=OFF
     fi
-    make
+    make -j "${THREADS}"
     make install
 fi

contrib/deps/install_deps.sh

@@ -17,6 +17,7 @@ else
   exit 1
 fi
 
+THREADS="1"
 BUILD_CXX="false"
 PARAMIKO="false"
 
@@ -28,19 +29,21 @@ do
 key="$1"
 
 case $key in
+    --threads)
+        THREADS="$2"
+        shift # past count
+        ;;
     --cxx)
-    BUILD_CXX="true"
-    shift # past argument
-    ;;
+        BUILD_CXX="true"
+        ;;
     --paramiko)
-    PARAMIKO="true"
-    shift # past argument
-    ;;
+        PARAMIKO="true"
+        ;;
     *)    # unknown option
-    POSITIONAL+=("$1") # save it in an array for later
-    shift # past argument
-    ;;
+        POSITIONAL+=("$1") # save it in an array for later
+        ;;
 esac
+    shift # past flag
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
@@ -65,6 +68,7 @@ export DOWNLOAD_DIR
 export BUILD_DIR
 export INSTALL_DIR
 export CMAKE
+export THREADS
 
 echo "Installing SQLite3"
 . ${SCRIPT_PATH}/sqlite3.sh

contrib/deps/jemalloc.sh

@@ -25,6 +25,6 @@ if [[ ! -d "${jemalloc_prefix}" ]]; then
     if [[ ! -f Makefile ]]; then
         ../configure --prefix="${jemalloc_prefix}"
     fi
-    make
+    make -j "${THREADS}"
     make -i install
 fi

contrib/deps/sqlite3.sh

@@ -25,6 +25,6 @@ if [[ ! -d "${sqlite3_prefix}" ]]; then
     if [[ ! -f Makefile ]]; then
         CFLAGS="-USQLITE_TEMP_STORE -DSQLITE_TEMP_STORE=3 -USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0 -USQLITE_MAX_EXPR_DEPTH -DSQLITE_MAX_EXPR_DEPTH=0 -USQLITE_DEFAULT_MEMSTATUS -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DECLTYPE -USQLITE_ENABLE_DBSTAT_VTAB -USQLITE_ENABLE_RTREE -USQLITE_ENABLE_FTS4 -USQLITE_ENABLE_JSON1 -USQLITE_OMIT_PROGRESS_CALLBACK -USQLITE_MAX_ATTACHED -DSQLITE_MAX_ATTACHED=125 -O3" ../configure --prefix="${sqlite3_prefix}"
     fi
-    make
+    make -j "${THREADS}"
     make install
 fi

contrib/deps/sqlite3_pcre.sh

@@ -26,8 +26,8 @@ if [[ ! -d "${pcre_prefix}" ]]; then
     cd build
     if [[ ! -f Makefile ]]; then
         export PKG_CONFIG_PATH="${INSTALL_DIR}/sqlite3/lib/pkgconfig:${PKG_CONFIG_PATH}"
-        $CMAKE .. -DCMAKE_INSTALL_PREFIX="${pcre_prefix}"
+        ${CMAKE} .. -DCMAKE_INSTALL_PREFIX="${pcre_prefix}"
     fi
-    make
+    make -j "${THREADS}"
     make install
 fi