]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #46554 from adamemerson/wip-up-the-boost
authorKefu Chai <tchaikov@gmail.com>
Mon, 25 Jul 2022 23:39:10 +0000 (07:39 +0800)
committerGitHub <noreply@github.com>
Mon, 25 Jul 2022 23:39:10 +0000 (07:39 +0800)
build: Bump Boost version to 1.79

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
1  2 
CMakeLists.txt
install-deps.sh
win32_deps_build.sh

diff --cc CMakeLists.txt
index c0870323a943461912464021955167e51582d58e,59626058bbb4c54eaebe0d89b966fde1089e764b..b156e139d74660a189e47854135ab23c5dd80de5
@@@ -636,15 -635,11 +636,15 @@@ if(WITH_SYSTEM_BOOST
        INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
    endif()
  else()
 -  set(BOOST_J 1 CACHE STRING
 -    "max jobs for Boost build") # override w/-DBOOST_J=<n>
 +  include(ProcessorCount)
 +  ProcessorCount(DEFAULT_BOOST_J)
 +  if(DEFAULT_BOOST_J EQUAL 0)
 +    set(DEFAULT_BOOST_J 1)
 +  endif()
 +  set(BOOST_J ${DEFAULT_BOOST_J} CACHE STRING "max jobs for Boost build") # override w/-DBOOST_J=<n>
    set(Boost_USE_STATIC_LIBS ON)
    include(BuildBoost)
-   build_boost(1.75
+   build_boost(1.79
      COMPONENTS ${BOOST_COMPONENTS} ${BOOST_HEADER_COMPONENTS})
  endif()
  include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS})
diff --cc install-deps.sh
Simple merge
Simple merge