From d90a0eab3d7924abb84e45413733a2cf0d0075fb Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Fri, 28 Feb 2025 17:35:05 -0600
Subject: [PATCH] updated build system

---
 cmake/libraries/boost.cmake |  4 ++--
 cmake/libraries/curl.cmake  |  3 +--
 cmake/versions.cmake        | 12 ++++++------
 scripts/make_common.sh      |  5 +++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cmake/libraries/boost.cmake b/cmake/libraries/boost.cmake
index a345372c..99825e4b 100644
--- a/cmake/libraries/boost.cmake
+++ b/cmake/libraries/boost.cmake
@@ -120,11 +120,11 @@ if(PROJECT_ENABLE_BOOST)
           --with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread
         BUILD_COMMAND
           ./b2
-          -j1
+          -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
           ${BOOST_BUILD_ARGS}
         INSTALL_COMMAND
           ./b2
-          -j1
+          -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
           ${BOOST_BUILD_ARGS}
           install
       )
diff --git a/cmake/libraries/curl.cmake b/cmake/libraries/curl.cmake
index d384b3ab..31574dc8 100644
--- a/cmake/libraries/curl.cmake
+++ b/cmake/libraries/curl.cmake
@@ -18,8 +18,7 @@ if(PROJECT_ENABLE_CURL)
       URL ${PROJECT_3RD_PARTY_DIR}/curl-${CURL_VERSION}.tar.gz
       URL_HASH SHA256=${CURL_HASH}
       LIST_SEPARATOR |
-      CMAKE_ARGS 
-        ${PROJECT_EXTERNAL_CMAKE_FLAGS}
+      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
         -DBUILD_CURL_EXE=OFF
         -DBUILD_LIBCURL_DOCS=OFF
         -DBUILD_MISC_DOCS=OFF
diff --git a/cmake/versions.cmake b/cmake/versions.cmake
index 0ca649f6..147a990d 100644
--- a/cmake/versions.cmake
+++ b/cmake/versions.cmake
@@ -1,15 +1,15 @@
 set(BINUTILS_VERSION 2.43)
-set(BOOST_MAJOR_VERSION 1)
-set(BOOST_MINOR_VERSION 87)
-set(BOOST_PATCH_VERSION 0)
 set(BOOST2_MAJOR_VERSION 1)
 set(BOOST2_MINOR_VERSION 76)
 set(BOOST2_PATCH_VERSION 0)
+set(BOOST_MAJOR_VERSION 1)
+set(BOOST_MINOR_VERSION 87)
+set(BOOST_PATCH_VERSION 0)
 set(CPP_HTTPLIB_VERSION 0.19.0)
-set(CURL_VERSION 8.12.1)
 set(CURL2_VERSION 8_12_1)
-set(EXPAT_VERSION 2.6.4)
+set(CURL_VERSION 8.12.1)
 set(EXPAT2_VERSION 2_6_4)
+set(EXPAT_VERSION 2.6.4)
 set(GCC_VERSION 14.2.0)
 set(GTEST_VERSION 1.16.0)
 set(ICU_VERSION 76-1)
@@ -22,7 +22,7 @@ set(PKG_CONFIG_VERSION 0.29.2)
 set(PUGIXML_VERSION 1.15)
 set(ROCKSDB_VERSION 9.10.0)
 set(SPDLOG_VERSION 1.15.1)
-set(SQLITE_VERSION 3490100)
 set(SQLITE2_VERSION 3.49.1)
+set(SQLITE_VERSION 3490100)
 set(STDUUID_VERSION 1.2.3)
 set(ZLIB_VERSION 1.3.1)
diff --git a/scripts/make_common.sh b/scripts/make_common.sh
index 4f8382de..9261a7c3 100755
--- a/scripts/make_common.sh
+++ b/scripts/make_common.sh
@@ -34,10 +34,11 @@ if [ "${PROJECT_BUILD_CLEAN}" == "clean" ]; then
   popd
 fi
 
-make -j${NUM_JOBS} || exit 1
+export CMAKE_BUILD_PARALLEL_LEVEL=${NUM_JOBS}
+make || exit 1
 
 pushd build
-make -j${NUM_JOBS} || exit 1
+make -j${CMAKE_BUILD_PARALLEL_LEVEL} || exit 1
 popd
 popd