]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: check bootstrap.sh instead before downloading boost 20515/head
authorKefu Chai <kchai@redhat.com>
Fri, 24 Nov 2017 02:35:00 +0000 (10:35 +0800)
committerCasey Bodley <cbodley@redhat.com>
Wed, 21 Feb 2018 19:16:32 +0000 (14:16 -0500)
config.hpp does not exist if boost is not configured. so a boost source
directory unpacked from dist tarball does not have this file. the
bootstrap.sh instead, it is used to create the necessary config files
for jam.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e3b703eb12303fa365c7d9c1b11ba117cb3f7590)

cmake/modules/BuildBoost.cmake

index b1ae470ad20dede9626c47fa46801517c127882d..c7cd39a1107707d2063db1f7bb8663b223fbee08 100644 (file)
@@ -75,7 +75,7 @@ function(do_build_boost version)
   set(install_command
     ${b2} install)
   set(boost_root_dir "${CMAKE_BINARY_DIR}/boost")
-  if(EXISTS "${PROJECT_SOURCE_DIR}/src/boost/libs/config/include/boost/config.hpp")
+  if(EXISTS "${PROJECT_SOURCE_DIR}/src/boost/bootstrap.sh")
     message(STATUS "boost already in src")
     set(source_dir
       SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost")