From: Kefu Chai <kchai@redhat.com>
Date: Fri, 24 Nov 2017 02:35:00 +0000 (+0800)
Subject: cmake: check bootstrap.sh instead before downloading boost
X-Git-Tag: v12.2.4~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1201c01621177eac53bfb21bdd1fbdea4343dedb;p=ceph.git

cmake: check bootstrap.sh instead before downloading boost

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)
---

diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
index b1ae470ad20d..c7cd39a11077 100644
--- a/cmake/modules/BuildBoost.cmake
+++ b/cmake/modules/BuildBoost.cmake
@@ -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")