From: Kefu Chai Date: Wed, 2 Mar 2022 15:49:50 +0000 (+0800) Subject: cmake: use string(JOIN ..) to compose URL for boost download X-Git-Tag: v18.0.0~1308^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f356cc8869eb7233865faea65351851c5e38fe18;p=ceph-ci.git cmake: use string(JOIN ..) to compose URL for boost download * since the minimum required cmake version is now 3.16, there is no need to check for cmake version for using multiple URLs for downloading external project. * use string(JOIN ..) to compose URL option for downloading boost Signed-off-by: Kefu Chai --- diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake index 36e430e9ed7..c48cb0cbbbc 100644 --- a/cmake/modules/BuildBoost.cmake +++ b/cmake/modules/BuildBoost.cmake @@ -153,14 +153,10 @@ function(do_build_boost root_dir version) set(boost_version 1.75.0) set(boost_sha256 953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb) string(REPLACE "." "_" boost_version_underscore ${boost_version} ) - set(boost_url - https://boostorg.jfrog.io/artifactory/main/release/${boost_version}/source/boost_${boost_version_underscore}.tar.bz2) - if(CMAKE_VERSION VERSION_GREATER 3.7) - set(boost_url - "${boost_url} http://downloads.sourceforge.net/project/boost/boost/${boost_version}/boost_${boost_version_underscore}.tar.bz2") - set(boost_url - "${boost_url} https://download.ceph.com/qa/boost_${boost_version_underscore}.tar.bz2") - endif() + string(JOIN " " boost_url + https://boostorg.jfrog.io/artifactory/main/release/${boost_version}/source/boost_${boost_version_underscore}.tar.bz2 + https://downloads.sourceforge.net/project/boost/boost/${boost_version}/boost_${boost_version_underscore}.tar.bz2 + https://download.ceph.com/qa/boost_${boost_version_underscore}.tar.bz2) set(source_dir URL ${boost_url} URL_HASH SHA256=${boost_sha256}