BlockStorage/repertory
1
0
Fork 0
Code Issues 7 Pull Requests Releases 6 Wiki Activity

updated build system
Some checks reported errors
BlockStorage/repertory/pipeline/head Something is wrong with the build of this commit
Details

Browse Source
This commit is contained in:
Scott E. Graves 2025-02-28 17:35:05 -06:00
parent c6448cc64c
commit d90a0eab3d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/libraries/boost.cmake
View File

@ -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 --with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread
BUILD_COMMAND BUILD_COMMAND
./b2 ./b2
-j1 -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
${BOOST_BUILD_ARGS} ${BOOST_BUILD_ARGS}
INSTALL_COMMAND INSTALL_COMMAND
./b2 ./b2
-j1 -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
${BOOST_BUILD_ARGS} ${BOOST_BUILD_ARGS}
install install
) )

3
cmake/libraries/curl.cmake
View File

@ -18,8 +18,7 @@ if(PROJECT_ENABLE_CURL)
URL ${PROJECT_3RD_PARTY_DIR}/curl-${CURL_VERSION}.tar.gz URL ${PROJECT_3RD_PARTY_DIR}/curl-${CURL_VERSION}.tar.gz
URL_HASH SHA256=${CURL_HASH} URL_HASH SHA256=${CURL_HASH}
LIST_SEPARATOR | LIST_SEPARATOR |
CMAKE_ARGS CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
${PROJECT_EXTERNAL_CMAKE_FLAGS}
-DBUILD_CURL_EXE=OFF -DBUILD_CURL_EXE=OFF
-DBUILD_LIBCURL_DOCS=OFF -DBUILD_LIBCURL_DOCS=OFF
-DBUILD_MISC_DOCS=OFF -DBUILD_MISC_DOCS=OFF

12
cmake/versions.cmake
View File

@ -1,15 +1,15 @@
set(BINUTILS_VERSION 2.43) 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_MAJOR_VERSION 1)
set(BOOST2_MINOR_VERSION 76) set(BOOST2_MINOR_VERSION 76)
set(BOOST2_PATCH_VERSION 0) 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(CPP_HTTPLIB_VERSION 0.19.0)
set(CURL_VERSION 8.12.1)
set(CURL2_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(EXPAT2_VERSION 2_6_4)
set(EXPAT_VERSION 2.6.4)
set(GCC_VERSION 14.2.0) set(GCC_VERSION 14.2.0)
set(GTEST_VERSION 1.16.0) set(GTEST_VERSION 1.16.0)
set(ICU_VERSION 76-1) set(ICU_VERSION 76-1)
@ -22,7 +22,7 @@ set(PKG_CONFIG_VERSION 0.29.2)
set(PUGIXML_VERSION 1.15) set(PUGIXML_VERSION 1.15)
set(ROCKSDB_VERSION 9.10.0) set(ROCKSDB_VERSION 9.10.0)
set(SPDLOG_VERSION 1.15.1) set(SPDLOG_VERSION 1.15.1)
set(SQLITE_VERSION 3490100)
set(SQLITE2_VERSION 3.49.1) set(SQLITE2_VERSION 3.49.1)
set(SQLITE_VERSION 3490100)
set(STDUUID_VERSION 1.2.3) set(STDUUID_VERSION 1.2.3)
set(ZLIB_VERSION 1.3.1) set(ZLIB_VERSION 1.3.1)

5
scripts/make_common.sh
View File

@ -34,10 +34,11 @@ if [ "${PROJECT_BUILD_CLEAN}" == "clean" ]; then
popd popd
fi fi
make -j${NUM_JOBS} || exit 1 export CMAKE_BUILD_PARALLEL_LEVEL=${NUM_JOBS}
make || exit 1
pushd build pushd build
make -j${NUM_JOBS} || exit 1 make -j${CMAKE_BUILD_PARALLEL_LEVEL} || exit 1
popd popd
popd popd