]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: check bootstrap.sh instead before downloading boost
authorKefu Chai <kchai@redhat.com>
Fri, 24 Nov 2017 02:35:00 +0000 (10:35 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 24 Nov 2017 03:13:16 +0000 (11:13 +0800)
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>
cmake/modules/BuildBoost.cmake

index 1e5bcd5f8681be90cc73dcaaf6f9a9d5b145e8f5..d70828398ecf60790b3bfb5b76a78dbbd1648bdd 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")