From 1f1e7295e026b5b6bdf6122a98d36d521fff1dbb Mon Sep 17 00:00:00 2001 From: Joerg-Christian Boehme Date: Sun, 16 Feb 2020 15:00:36 +0100 Subject: [PATCH] Create boost config from boost if USE_CONFIG_FROM_BOOST is set --- cmake/projects/Boost/schemes/url_sha1_boost.cmake.in | 2 +- .../projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in | 2 +- cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in b/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in index e09e9ffbba..9d9cab6e4d 100644 --- a/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in +++ b/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in @@ -105,7 +105,7 @@ configure_file( set(pass_boost_no_cmake_config ) -if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0) +if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0 AND NOT USE_CONFIG_FROM_BOOST) set(pass_boost_no_cmake_config --no-cmake-config) endif() diff --git a/cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in b/cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in index 85d9dad2d7..a7fce1a634 100644 --- a/cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in +++ b/cmake/projects/Boost/schemes/url_sha1_boost_ios_library.cmake.in @@ -133,7 +133,7 @@ set( --user-config="${boost_user_jam}" ) -if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0) +if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0 AND NOT USE_CONFIG_FROM_BOOST) list(APPEND build_opts --no-cmake-config ) endif() diff --git a/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in b/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in index 06863a5d23..a950038bd3 100644 --- a/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in +++ b/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in @@ -233,7 +233,7 @@ set( --with-@HUNTER_PACKAGE_COMPONENT@ ) -if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0) +if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0 AND NOT USE_CONFIG_FROM_BOOST) list(APPEND build_opts --no-cmake-config ) endif()