diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 882a9b1273..5fe1137445 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -33,14 +33,7 @@ hunter_default_version(Async++ VERSION 0.0.3-hunter) hunter_default_version(Avahi VERSION 0.6.31) hunter_default_version(BZip2 VERSION 1.0.8-p0) hunter_default_version(Beast VERSION 1.0.0-b84-hunter-0) - -if(MINGW) - # https://github.com/boostorg/build/issues/301 - hunter_default_version(Boost VERSION 1.64.0) -else() - hunter_default_version(Boost VERSION 1.86.0) -endif() - +hunter_default_version(Boost VERSION 1.86.0) hunter_default_version(BoostCompute VERSION 0.5-p0) hunter_default_version(BoostProcess VERSION 0.5) hunter_default_version(BoringSSL VERSION 0.0.0-0f5ecd3a8-p0) diff --git a/cmake/modules/hunter_install_boost_config.cmake b/cmake/modules/hunter_install_boost_config.cmake deleted file mode 100644 index a3526897b0..0000000000 --- a/cmake/modules/hunter_install_boost_config.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (c) 2015, Ruslan Baratov -# All rights reserved. - -include(hunter_assert_not_empty_string) - -function(hunter_install_boost_config) - hunter_assert_not_empty_string("${HUNTER_SELF}") - hunter_assert_not_empty_string("${HUNTER_PACKAGE_INSTALL_PREFIX}") - hunter_assert_not_empty_string("${HUNTER_Boost_VERSION}") - - set(templates "${HUNTER_SELF}/cmake/templates") - set(configs "${HUNTER_PACKAGE_INSTALL_PREFIX}/lib/cmake/Boost") - - configure_file( - "${templates}/BoostConfigVersion.cmake.in" - "${configs}/BoostConfigVersion.cmake" - @ONLY - ) - - configure_file( - "${templates}/BoostConfig.cmake.in" - "${configs}/BoostConfig.cmake" - @ONLY - ) - - if(BOOST_CONFIG_LINK_ZLIB) - configure_file( - "${templates}/BoostZLIBDependency.cmake.in" - "${configs}/BoostZLIBDependency.cmake" - @ONLY - ) - endif() - - if(BOOST_CONFIG_LINK_BZIP2) - configure_file( - "${templates}/BoostBZip2Dependency.cmake.in" - "${configs}/BoostBZip2Dependency.cmake" - @ONLY - ) - endif() -endfunction() diff --git a/cmake/projects/Boost/atomic/hunter.cmake b/cmake/projects/Boost/atomic/hunter.cmake index 05c6b1e6aa..5358a44c17 100644 --- a/cmake/projects/Boost/atomic/hunter.cmake +++ b/cmake/projects/Boost/atomic/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT atomic - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/charconv/hunter.cmake b/cmake/projects/Boost/charconv/hunter.cmake index 3b05609a3b..6e92073371 100644 --- a/cmake/projects/Boost/charconv/hunter.cmake +++ b/cmake/projects/Boost/charconv/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT charconv - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/chrono/hunter.cmake b/cmake/projects/Boost/chrono/hunter.cmake index 40acea809d..5a0401ba4c 100644 --- a/cmake/projects/Boost/chrono/hunter.cmake +++ b/cmake/projects/Boost/chrono/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT chrono - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/ci/matrix.json b/cmake/projects/Boost/ci/matrix.json index d713c69c6d..6a372e9740 100644 --- a/cmake/projects/Boost/ci/matrix.json +++ b/cmake/projects/Boost/ci/matrix.json @@ -13,33 +13,19 @@ { "example": "Boost", "toolchain": "mingw-cxx17", "os": "windows-2022" }, { "example": "Boost", "toolchain": "msys-cxx17", "os": "windows-2022" }, -{ "example": "Boost-useBoostConfig", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" }, -{ "example": "Boost-useBoostConfig", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" }, -{ "example": "Boost-useBoostConfig", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" }, -{ "example": "Boost-useBoostConfig", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" }, -{ "example": "Boost-useBoostConfig", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" }, -{ "example": "Boost-useBoostConfig", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" }, -{ "example": "Boost-useBoostConfig", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" }, -{ "example": "Boost-useBoostConfig", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" }, -{ "example": "Boost-useBoostConfig", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" }, -{ "example": "Boost-useBoostConfig", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" }, -{ "example": "Boost-useBoostConfig", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" }, -{ "example": "Boost-useBoostConfig", "toolchain": "mingw-cxx17", "os": "windows-2022" }, -{ "example": "Boost-useBoostConfig", "toolchain": "msys-cxx17", "os": "windows-2022" }, - -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" }, -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" }, -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" }, -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" }, -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" }, -// { "example": "Boost-chrono-useBoostConfig", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" }, -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" }, -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" }, -// { "example": "Boost-chrono-useBoostConfig", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" }, -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" }, -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" }, -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "mingw-cxx17", "os": "windows-2022" }, -{ "example": "Boost-chrono-useBoostConfig", "toolchain": "msys-cxx17", "os": "windows-2022" }, +{ "example": "Boost-chrono", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" }, +{ "example": "Boost-chrono", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" }, +{ "example": "Boost-chrono", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" }, +{ "example": "Boost-chrono", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" }, +{ "example": "Boost-chrono", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" }, +// { "example": "Boost-chrono", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" }, +{ "example": "Boost-chrono", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" }, +{ "example": "Boost-chrono", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" }, +// { "example": "Boost-chrono", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" }, +{ "example": "Boost-chrono", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" }, +{ "example": "Boost-chrono", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" }, +{ "example": "Boost-chrono", "toolchain": "mingw-cxx17", "os": "windows-2022" }, +{ "example": "Boost-chrono", "toolchain": "msys-cxx17", "os": "windows-2022" }, // { "example": "Boost-charconv", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" }, { "example": "Boost-charconv", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" }, @@ -111,19 +97,19 @@ { "example": "Boost-fiber", "toolchain": "mingw-cxx17", "os": "windows-2022" }, { "example": "Boost-fiber", "toolchain": "msys-cxx17", "os": "windows-2022" }, -{ "example": "Boost-filesystem-useBoostConfig", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" }, -// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" }, -// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" }, -// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" }, -{ "example": "Boost-filesystem-useBoostConfig", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" }, -// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" }, -{ "example": "Boost-filesystem-useBoostConfig", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" }, -// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" }, -// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" }, -// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" }, -// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" }, -{ "example": "Boost-filesystem-useBoostConfig", "toolchain": "mingw-cxx17", "os": "windows-2022" }, -{ "example": "Boost-filesystem-useBoostConfig", "toolchain": "msys-cxx17", "os": "windows-2022" }, +{ "example": "Boost-filesystem", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" }, +// { "example": "Boost-filesystem", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" }, +// { "example": "Boost-filesystem", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" }, +// { "example": "Boost-filesystem", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" }, +{ "example": "Boost-filesystem", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" }, +// { "example": "Boost-filesystem", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" }, +{ "example": "Boost-filesystem", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" }, +// { "example": "Boost-filesystem", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" }, +// { "example": "Boost-filesystem", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" }, +// { "example": "Boost-filesystem", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" }, +// { "example": "Boost-filesystem", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" }, +{ "example": "Boost-filesystem", "toolchain": "mingw-cxx17", "os": "windows-2022" }, +{ "example": "Boost-filesystem", "toolchain": "msys-cxx17", "os": "windows-2022" }, // { "example": "Boost-json", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" }, { "example": "Boost-json", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" }, @@ -139,19 +125,19 @@ { "example": "Boost-json", "toolchain": "mingw-cxx17", "os": "windows-2022" }, { "example": "Boost-json", "toolchain": "msys-cxx17", "os": "windows-2022" }, -// { "example": "Boost-log-useBoostConfig", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" }, -// { "example": "Boost-log-useBoostConfig", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" }, -{ "example": "Boost-log-useBoostConfig", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" }, -// { "example": "Boost-log-useBoostConfig", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" }, -{ "example": "Boost-log-useBoostConfig", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" }, -// { "example": "Boost-log-useBoostConfig", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" }, -{ "example": "Boost-log-useBoostConfig", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" }, -{ "example": "Boost-log-useBoostConfig", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" }, -// { "example": "Boost-log-useBoostConfig", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" }, -{ "example": "Boost-log-useBoostConfig", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" }, -// { "example": "Boost-log-useBoostConfig", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" }, -{ "example": "Boost-log-useBoostConfig", "toolchain": "mingw-cxx17", "os": "windows-2022" }, -{ "example": "Boost-log-useBoostConfig", "toolchain": "msys-cxx17", "os": "windows-2022" }, +// { "example": "Boost-log", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" }, +// { "example": "Boost-log", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" }, +{ "example": "Boost-log", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" }, +// { "example": "Boost-log", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" }, +{ "example": "Boost-log", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" }, +// { "example": "Boost-log", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" }, +{ "example": "Boost-log", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" }, +{ "example": "Boost-log", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" }, +// { "example": "Boost-log", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" }, +{ "example": "Boost-log", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" }, +// { "example": "Boost-log", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" }, +{ "example": "Boost-log", "toolchain": "mingw-cxx17", "os": "windows-2022" }, +{ "example": "Boost-log", "toolchain": "msys-cxx17", "os": "windows-2022" }, // { "example": "Boost-math", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" }, // { "example": "Boost-math", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" }, diff --git a/cmake/projects/Boost/cobalt/hunter.cmake b/cmake/projects/Boost/cobalt/hunter.cmake index 306ac0d79a..ac8de8944e 100644 --- a/cmake/projects/Boost/cobalt/hunter.cmake +++ b/cmake/projects/Boost/cobalt/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT cobalt - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/container/hunter.cmake b/cmake/projects/Boost/container/hunter.cmake index 66b75275e1..2349806a78 100644 --- a/cmake/projects/Boost/container/hunter.cmake +++ b/cmake/projects/Boost/container/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT container - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/context/hunter.cmake b/cmake/projects/Boost/context/hunter.cmake index 2540405a42..4ae5d87e05 100644 --- a/cmake/projects/Boost/context/hunter.cmake +++ b/cmake/projects/Boost/context/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT context - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/contract/hunter.cmake b/cmake/projects/Boost/contract/hunter.cmake index db9ae06633..04ee28069b 100644 --- a/cmake/projects/Boost/contract/hunter.cmake +++ b/cmake/projects/Boost/contract/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT contract - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/coroutine/hunter.cmake b/cmake/projects/Boost/coroutine/hunter.cmake index f22bdb405f..5ff43b5980 100644 --- a/cmake/projects/Boost/coroutine/hunter.cmake +++ b/cmake/projects/Boost/coroutine/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT coroutine - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/date_time/hunter.cmake b/cmake/projects/Boost/date_time/hunter.cmake index 1462f0905e..7e0b583b24 100644 --- a/cmake/projects/Boost/date_time/hunter.cmake +++ b/cmake/projects/Boost/date_time/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT date_time - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/exception/hunter.cmake b/cmake/projects/Boost/exception/hunter.cmake index 334173a4c7..ffd3a42464 100644 --- a/cmake/projects/Boost/exception/hunter.cmake +++ b/cmake/projects/Boost/exception/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT exception - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/fiber/hunter.cmake b/cmake/projects/Boost/fiber/hunter.cmake index a7ece60bd1..db518f7fa8 100644 --- a/cmake/projects/Boost/fiber/hunter.cmake +++ b/cmake/projects/Boost/fiber/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT fiber - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/filesystem/hunter.cmake b/cmake/projects/Boost/filesystem/hunter.cmake index 14cc7a3281..177bd80803 100644 --- a/cmake/projects/Boost/filesystem/hunter.cmake +++ b/cmake/projects/Boost/filesystem/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT filesystem - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/graph/hunter.cmake b/cmake/projects/Boost/graph/hunter.cmake index f6b19a8448..40dea908b9 100644 --- a/cmake/projects/Boost/graph/hunter.cmake +++ b/cmake/projects/Boost/graph/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT graph - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/graph_parallel/hunter.cmake b/cmake/projects/Boost/graph_parallel/hunter.cmake index 54913958fb..3c4708c2b9 100644 --- a/cmake/projects/Boost/graph_parallel/hunter.cmake +++ b/cmake/projects/Boost/graph_parallel/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT graph_parallel - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/hunter.cmake b/cmake/projects/Boost/hunter.cmake index 5724ed43a8..8ce38bc30e 100644 --- a/cmake/projects/Boost/hunter.cmake +++ b/cmake/projects/Boost/hunter.cmake @@ -13,389 +13,6 @@ include(hunter_check_toolchain_definition) # Disable searching in locations not specified by these hint variables. set(Boost_NO_SYSTEM_PATHS ON) -# up until 1.63 sourcefourge was used, base url https://downloads.sourceforge.net/project/boost/boost -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.49.0" - URL - "http://sourceforge.net/projects/boost/files/boost/1.49.0/boost_1_49_0.tar.bz2/download" - SHA1 - 26a52840e9d12f829e3008589abf0a925ce88524 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.50.0" - URL - "http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download" - SHA1 - ee06f89ed472cf369573f8acf9819fbc7173344e -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.51.0" - URL - "http://sourceforge.net/projects/boost/files/boost/1.51.0/boost_1_51_0.tar.bz2/download" - SHA1 - 52ef06895b97cc9981b8abf1997c375ca79f30c5 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.52.0" - URL - "http://sourceforge.net/projects/boost/files/boost/1.52.0/boost_1_52_0.tar.bz2/download" - SHA1 - cddd6b4526a09152ddc5db856463eaa1dc29c5d9 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.53.0" - URL - "http://sourceforge.net/projects/boost/files/boost/1.53.0/boost_1_53_0.tar.bz2/download" - SHA1 - e6dd1b62ceed0a51add3dda6f3fc3ce0f636a7f3 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.54.0" - URL - "http://sourceforge.net/projects/boost/files/boost/1.54.0/boost_1_54_0.tar.bz2/download" - SHA1 - 230782c7219882d0fab5f1effbe86edb85238bf4 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.55.0" - URL - "http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2/download" - SHA1 - cef9a0cc7084b1d639e06cd3bc34e4251524c840 -) - -# Workaround for: https://svn.boost.org/trac/boost/ticket/9610 -# http://boost.2283326.n4.nabble.com/config-clang-int128-support-td4653826.html -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.55.0-patched" - URL - "http://sourceforge.net/projects/hunter-packages/files/boost_1_55_0-patched.tar.bz2/download" - SHA1 - 308adf99dbdf0668c9695ff1da075a9e3b71be9d -) - -# Apply fix for: https://svn.boost.org/trac/boost/ticket/9332 -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.55.0-patched-2" - URL - "http://sourceforge.net/projects/hunter-packages/files/boost_1_55_0-patched-2.tar.bz2/download" - SHA1 - 38c0523dbd27ed6b363ad9255548e942d404b39e -) - -# Remove docs and tests -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.55.0-patched-3" - URL - "https://github.com/hunter-packages/boost/archive/1.55.0-patched-3.tar.gz" - SHA1 - 4ae01023ac0dc68570fd1bbcf67cbcd839df04eb -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.56.0" - URL - "https://github.com/hunter-packages/boost/archive/v1.56.0.tar.gz" - SHA1 - 08a45c69e90e5ddc485b770a573dbace8e48932e -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.57.0" - URL - "https://github.com/hunter-packages/boost/archive/v1.57.0.tar.gz" - SHA1 - 9305649224848860664893342ac29709ebcf42f9 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.58.0" - URL - "http://sourceforge.net/projects/boost/files/boost/1.58.0/boost_1_58_0.tar.bz2/download" - SHA1 - 2fc96c1651ac6fe9859b678b165bd78dc211e881 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.58.0-p0" - URL - "https://github.com/hunter-packages/boost/archive/v1.58.0-p0.tar.gz" - SHA1 - 0c3a2f284e85a61e2d2ccc1a6fdc8dc7a443ef67 -) - -# Version without tests and docs -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.58.0-p1" - URL - "https://github.com/hunter-packages/boost/archive/v1.58.0-p1.tar.gz" - SHA1 - bc417f98b644f244121c0eb47e810b4c6a6277e8 -) - -# Version without tests and docs -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.59.0" - URL - "https://github.com/hunter-packages/boost/archive/v1.59.0.tar.gz" - SHA1 - 28db0e54f9e55ff1230903704836e035f7227fd5 -) - -# Version without tests and docs -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.60.0" - URL - "https://github.com/hunter-packages/boost/archive/v1.60.0.tar.gz" - SHA1 - 28a5b0f739114fde5d4ed1d7f52e5b6cf13fe54a -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.61.0" - URL - "https://downloads.sourceforge.net/project/boost/boost/1.61.0/boost_1_61_0.tar.bz2" - SHA1 - f84b1a1ce764108ec3c2b7bd7704cf8dfd3c9d01 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.62.0" - URL - "https://downloads.sourceforge.net/project/boost/boost/1.62.0/boost_1_62_0.tar.bz2" - SHA1 - 5fd97433c3f859d8cbab1eaed4156d3068ae3648 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.63.0" - URL - "https://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2" - SHA1 - 9f1dd4fa364a3e3156a77dc17aa562ef06404ff6 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.64.0" - URL - "https://downloads.sourceforge.net/project/boost/boost/1.64.0/boost_1_64_0.tar.bz2" - SHA1 - 51421ef259a4530edea0fbfc448460fcc5c64edb -) - -# for official boost releases use base url https://archives.boost.io/release -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.65.1" - URL - "https://archives.boost.io/release/1.65.1/source/boost_1_65_1.tar.bz2" - SHA1 - 4a5b0c3c1b1b9a4d6cb6a6cc395e903e76f76720 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.65.0" - URL - "https://archives.boost.io/release/1.65.0/source/boost_1_65_0.tar.bz2" - SHA1 - f9260074ecfb31f3e65322fae9c15cc423c0ad59 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.66.0" - URL - "https://archives.boost.io/release/1.66.0/source/boost_1_66_0.7z" - SHA1 - 075d0b43980614054b1f1bafd189f863bba6600e -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.66.0-p0" - URL - "https://github.com/hunter-packages/boost/releases/download/v1.66.0-p0/hunter-1.66.0.7z" - SHA1 - 8c9829ce5e8f0b2b582f8ee1a6103c037a154aa3 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.67.0" - URL - "https://archives.boost.io/release/1.67.0/source/boost_1_67_0.7z" - SHA1 - 64c278c23defe155e630a307ae2c0615348b14b3 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.67.0-p0" - URL - "https://github.com/hunter-packages/boost/archive/v1.67.0-p0.tar.gz" - SHA1 - e56a5fbafa31683047f92850e05735dfcde084aa -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.67.0-p1" - URL - "https://github.com/hunter-packages/boost/releases/download/v1.67.0-p1/hunter-1.67.0.7z" - SHA1 - 26fcf19a79d013a318562435cef2829ea6bf29a4 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.68.0-p0" - URL - "https://github.com/hunter-packages/boost/releases/download/v1.68.0-p0/hunter-1.68.0.7z" - SHA1 - 3af972569d4b685145442445e51b3fcace342b31 -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.68.0-p1" - URL - "https://github.com/hunter-packages/boost/archive/v1.68.0-p1.tar.gz" - SHA1 - 0bb10b0a0fdc196646c87e0143c0290baa32357d -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.69.0-p0" - URL - "https://github.com/hunter-packages/boost/archive/v1.69.0-p0.tar.gz" - SHA1 - 2539b0751f77ff3efdf842775700fe5422c2adfb -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.69.0-p1" - URL - "https://github.com/hunter-packages/boost/archive/v1.69.0-p1.tar.gz" - SHA1 - 7f3a890d698912516f45effb3c88a8b6f93ed2da -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.70.0-p0" - URL - "https://github.com/hunter-packages/boost/archive/v1.70.0-p0.tar.gz" - SHA1 - e6bb97b5109c7c15ea459cf2b1a9d52cbf88a89e -) - -hunter_add_version( - PACKAGE_NAME - Boost - VERSION - "1.71.0-p0" - URL - "https://github.com/cpp-pm/boost/archive/v1.71.0-p0.tar.gz" - SHA1 - a3aae228568555c997927d5f531acb8f4830762c -) - hunter_add_version( PACKAGE_NAME Boost @@ -572,27 +189,24 @@ endif() hunter_pick_scheme(DEFAULT url_sha1_boost) hunter_cacheable(Boost) -hunter_download(PACKAGE_NAME Boost PACKAGE_INTERNAL_DEPS_ID "49") +hunter_download(PACKAGE_NAME Boost PACKAGE_INTERNAL_DEPS_ID "51") # This settings Boost_USE_STATIC_LIBS and Boost_USE_STATIC_RUNTIME are needed to configure via find_package(Boost ....) for BoostConfig from boost if(NOT HUNTER_Boost_VERSION VERSION_LESS 1.72.0) hunter_get_cmake_args(PACKAGE Boost OUT boost_cmake_args) string(FIND "${boost_cmake_args}" "BUILD_SHARED_LIBS=ON" boost_shared) - string(FIND "${boost_cmake_args}" "USE_CONFIG_FROM_BOOST=ON" use_boost_config) string(FIND "${boost_cmake_args}" "BOOST_BUILD_DYNAMIC_VSRUNTIME=NO" boost_static_runtime) - if(use_boost_config GREATER -1) - if(boost_shared LESS 0) - option(Boost_USE_STATIC_LIBS "Use of the static libraries" ON) - else() - option(Boost_USE_STATIC_LIBS "Use of the static libraries" OFF) - endif() + if(boost_shared LESS 0) + option(Boost_USE_STATIC_LIBS "Use of the static libraries" ON) + else() + option(Boost_USE_STATIC_LIBS "Use of the static libraries" OFF) + endif() - if(MSVC) - if(boost_static_runtime LESS 0) - option(Boost_USE_STATIC_RUNTIME "Use libraries linked statically to the C++ runtime" OFF) - else() - option(Boost_USE_STATIC_RUNTIME "Use libraries linked statically to the C++ runtime" ON) - endif() + if(MSVC) + if(boost_static_runtime LESS 0) + option(Boost_USE_STATIC_RUNTIME "Use libraries linked statically to the C++ runtime" OFF) + else() + option(Boost_USE_STATIC_RUNTIME "Use libraries linked statically to the C++ runtime" ON) endif() endif() endif() diff --git a/cmake/projects/Boost/hunter.cmake.in b/cmake/projects/Boost/hunter.cmake.in index d4637cd888..dc5ac3e1c6 100644 --- a/cmake/projects/Boost/hunter.cmake.in +++ b/cmake/projects/Boost/hunter.cmake.in @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT boost_component - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/iostreams/hunter.cmake b/cmake/projects/Boost/iostreams/hunter.cmake index dddf0a7629..214a5e950f 100644 --- a/cmake/projects/Boost/iostreams/hunter.cmake +++ b/cmake/projects/Boost/iostreams/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT iostreams - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/json/hunter.cmake b/cmake/projects/Boost/json/hunter.cmake index ebdc58ccae..746ec2134f 100644 --- a/cmake/projects/Boost/json/hunter.cmake +++ b/cmake/projects/Boost/json/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT json - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/locale/hunter.cmake b/cmake/projects/Boost/locale/hunter.cmake index c19ecf7019..3caa3cca7f 100644 --- a/cmake/projects/Boost/locale/hunter.cmake +++ b/cmake/projects/Boost/locale/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT locale - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/log/hunter.cmake b/cmake/projects/Boost/log/hunter.cmake index 8031115b0b..45c2e56348 100644 --- a/cmake/projects/Boost/log/hunter.cmake +++ b/cmake/projects/Boost/log/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT log - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/math/hunter.cmake b/cmake/projects/Boost/math/hunter.cmake index 401c6c7deb..6dc754a880 100644 --- a/cmake/projects/Boost/math/hunter.cmake +++ b/cmake/projects/Boost/math/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT math - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/mpi/hunter.cmake b/cmake/projects/Boost/mpi/hunter.cmake index c2d84a03e9..2db2d821a9 100644 --- a/cmake/projects/Boost/mpi/hunter.cmake +++ b/cmake/projects/Boost/mpi/hunter.cmake @@ -5,14 +5,6 @@ include(hunter_download) include(hunter_pick_scheme) -include(hunter_report_broken_package) - -if(NOT HUNTER_Boost_VERSION VERSION_LESS 1.56.0 AND MSVC) - hunter_report_broken_package( - "boost.mpi library failed to install even if b2 build exit with 0." - "Use boost 1.55.0-patched-3" - ) -endif() hunter_pick_scheme( DEFAULT @@ -26,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT mpi - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/nowide/hunter.cmake b/cmake/projects/Boost/nowide/hunter.cmake index e6e970a364..5bd887a89a 100644 --- a/cmake/projects/Boost/nowide/hunter.cmake +++ b/cmake/projects/Boost/nowide/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT nowide - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/predef/hunter.cmake b/cmake/projects/Boost/predef/hunter.cmake index 068bbd0e40..1bdf5a0805 100644 --- a/cmake/projects/Boost/predef/hunter.cmake +++ b/cmake/projects/Boost/predef/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT predef - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/process/hunter.cmake b/cmake/projects/Boost/process/hunter.cmake index a9af2de762..4f3486fc55 100644 --- a/cmake/projects/Boost/process/hunter.cmake +++ b/cmake/projects/Boost/process/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT process - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/program_options/hunter.cmake b/cmake/projects/Boost/program_options/hunter.cmake index 0e5f9e1b28..c351356b7c 100644 --- a/cmake/projects/Boost/program_options/hunter.cmake +++ b/cmake/projects/Boost/program_options/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT program_options - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/python/hunter.cmake b/cmake/projects/Boost/python/hunter.cmake index 49ca795a0d..4287610be3 100644 --- a/cmake/projects/Boost/python/hunter.cmake +++ b/cmake/projects/Boost/python/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT python - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/random/hunter.cmake b/cmake/projects/Boost/random/hunter.cmake index 2facf41646..f3921605b5 100644 --- a/cmake/projects/Boost/random/hunter.cmake +++ b/cmake/projects/Boost/random/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT random - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/regex/hunter.cmake b/cmake/projects/Boost/regex/hunter.cmake index cd1883f8b6..6b4ad723ec 100644 --- a/cmake/projects/Boost/regex/hunter.cmake +++ b/cmake/projects/Boost/regex/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT regex - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in b/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in index ab1e84a8ea..c6f673cec8 100644 --- a/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in +++ b/cmake/projects/Boost/schemes/url_sha1_boost.cmake.in @@ -11,7 +11,6 @@ include(ExternalProject) # ExternalProject_Add list(APPEND CMAKE_MODULE_PATH "@HUNTER_SELF@/cmake/modules") include(hunter_get_boost_libs) -include(hunter_install_boost_config) include(hunter_report_broken_package) include(hunter_status_debug) include(hunter_status_print) @@ -108,11 +107,6 @@ configure_file( ) -set(pass_boost_no_cmake_config ) -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() - ExternalProject_Add( "@HUNTER_EP_NAME@" URL @@ -148,7 +142,6 @@ ExternalProject_Add( ${boost_list} "--prefix=@HUNTER_PACKAGE_INSTALL_PREFIX@" --ignore-site-config # Ignore Gentoo specific optimization "none" in site config that only the patched bjam of Gentoo can understand. - ${pass_boost_no_cmake_config} COMMAND # Copy license files "@CMAKE_COMMAND@" "-C@HUNTER_ARGS_FILE@" # for 'HUNTER_INSTALL_LICENSE_FILES' @@ -168,7 +161,3 @@ ExternalProject_Add( set(HUNTER_SELF "@HUNTER_SELF@") set(HUNTER_PACKAGE_INSTALL_PREFIX "@HUNTER_PACKAGE_INSTALL_PREFIX@") set(HUNTER_Boost_VERSION "@HUNTER_Boost_VERSION@") - -if(NOT USE_CONFIG_FROM_BOOST OR HUNTER_Boost_VERSION VERSION_LESS 1.72.0) - hunter_install_boost_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 8508f94bbd..f1169385a6 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 @@ -12,7 +12,6 @@ list(APPEND CMAKE_MODULE_PATH "@HUNTER_SELF@/cmake/modules") include(hunter_boost_component_b2_args) include(hunter_dump_cmake_flags) -include(hunter_install_boost_config) include(hunter_internal_error) include(hunter_status_debug) include(hunter_assert_not_empty_string) @@ -133,10 +132,6 @@ set( --user-config="${boost_user_jam}" ) -if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0 AND NOT USE_CONFIG_FROM_BOOST) - list(APPEND build_opts --no-cmake-config ) -endif() - set(BOOST_VERSION "@HUNTER_Boost_VERSION@") # Use: @@ -401,7 +396,3 @@ ExternalProject_Add( set(HUNTER_SELF "@HUNTER_SELF@") set(HUNTER_PACKAGE_INSTALL_PREFIX "@HUNTER_PACKAGE_INSTALL_PREFIX@") set(HUNTER_Boost_VERSION "@HUNTER_Boost_VERSION@") - -if(NOT USE_CONFIG_FROM_BOOST OR HUNTER_Boost_VERSION VERSION_LESS 1.72.0) - hunter_install_boost_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 e2faed5653..9856c8d0cf 100644 --- a/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in +++ b/cmake/projects/Boost/schemes/url_sha1_boost_library.cmake.in @@ -16,7 +16,6 @@ include(hunter_boost_component_b2_args) include(hunter_dump_cmake_flags) include(hunter_fatal_error) include(hunter_get_boost_libs) -include(hunter_install_boost_config) include(hunter_internal_error) include(hunter_pick_archiver) include(hunter_status_debug) @@ -241,10 +240,6 @@ set( --abbreviate-paths ) -if (@HUNTER_Boost_VERSION@ VERSION_GREATER_EQUAL 1.72.0 AND NOT USE_CONFIG_FROM_BOOST) - list(APPEND build_opts --no-cmake-config ) -endif() - if("@MINGW@") # cross compile from "linux" to "windows" using mingw set(build_opts target-os=windows ${build_opts}) @@ -565,7 +560,3 @@ ExternalProject_Add( set(HUNTER_SELF "@HUNTER_SELF@") set(HUNTER_PACKAGE_INSTALL_PREFIX "@HUNTER_PACKAGE_INSTALL_PREFIX@") set(HUNTER_Boost_VERSION "@HUNTER_Boost_VERSION@") - -if(NOT USE_CONFIG_FROM_BOOST OR HUNTER_Boost_VERSION VERSION_LESS 1.72.0) - hunter_install_boost_config() -endif() diff --git a/cmake/projects/Boost/serialization/hunter.cmake b/cmake/projects/Boost/serialization/hunter.cmake index e4073a8008..6ab3d44eb8 100644 --- a/cmake/projects/Boost/serialization/hunter.cmake +++ b/cmake/projects/Boost/serialization/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT serialization - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/signals/hunter.cmake b/cmake/projects/Boost/signals/hunter.cmake index 32502b6e48..9dfda1b13f 100644 --- a/cmake/projects/Boost/signals/hunter.cmake +++ b/cmake/projects/Boost/signals/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT signals - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/stacktrace/hunter.cmake b/cmake/projects/Boost/stacktrace/hunter.cmake index f6d6a5f50d..17631a0dc1 100644 --- a/cmake/projects/Boost/stacktrace/hunter.cmake +++ b/cmake/projects/Boost/stacktrace/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT stacktrace - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/system/hunter.cmake b/cmake/projects/Boost/system/hunter.cmake index 1e9195295b..1973ca9601 100644 --- a/cmake/projects/Boost/system/hunter.cmake +++ b/cmake/projects/Boost/system/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT system - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/test/hunter.cmake b/cmake/projects/Boost/test/hunter.cmake index 94c19ae3d7..352e423fd1 100644 --- a/cmake/projects/Boost/test/hunter.cmake +++ b/cmake/projects/Boost/test/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT test - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/thread/hunter.cmake b/cmake/projects/Boost/thread/hunter.cmake index f436a5cf88..7685a030c0 100644 --- a/cmake/projects/Boost/thread/hunter.cmake +++ b/cmake/projects/Boost/thread/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT thread - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/timer/hunter.cmake b/cmake/projects/Boost/timer/hunter.cmake index 63c20b0946..c2a9c59558 100644 --- a/cmake/projects/Boost/timer/hunter.cmake +++ b/cmake/projects/Boost/timer/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT timer - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/type_erasure/hunter.cmake b/cmake/projects/Boost/type_erasure/hunter.cmake index c853e4a9f3..7a611bb6b8 100644 --- a/cmake/projects/Boost/type_erasure/hunter.cmake +++ b/cmake/projects/Boost/type_erasure/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT type_erasure - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/projects/Boost/wave/hunter.cmake b/cmake/projects/Boost/wave/hunter.cmake index 96ff14066c..23a4004605 100644 --- a/cmake/projects/Boost/wave/hunter.cmake +++ b/cmake/projects/Boost/wave/hunter.cmake @@ -18,5 +18,5 @@ hunter_download( Boost PACKAGE_COMPONENT wave - PACKAGE_INTERNAL_DEPS_ID "50" + PACKAGE_INTERNAL_DEPS_ID "51" ) diff --git a/cmake/templates/BoostBZip2Dependency.cmake.in b/cmake/templates/BoostBZip2Dependency.cmake.in deleted file mode 100644 index 63883e53b0..0000000000 --- a/cmake/templates/BoostBZip2Dependency.cmake.in +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015, Ruslan Baratov -# All rights reserved. - -# Do not call 'hunter_add_package(BZip2)' because BZip2 it not a basic dependency -find_package(BZip2 CONFIG REQUIRED) - -get_target_property( - _interface_link_libraries Boost::iostreams INTERFACE_LINK_LIBRARIES -) - -set_target_properties( - Boost::iostreams - PROPERTIES - INTERFACE_LINK_LIBRARIES "${_interface_link_libraries};BZip2::bz2" -) diff --git a/cmake/templates/BoostConfig.cmake.in b/cmake/templates/BoostConfig.cmake.in deleted file mode 100644 index 039647b0f4..0000000000 --- a/cmake/templates/BoostConfig.cmake.in +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright (c) 2015, Ruslan Baratov -# All rights reserved. - -include(hunter_check_toolchain_definition) - -if(HUNTER_ENABLED) - include(hunter_internal_error) - include(hunter_status_debug) -else() - function(hunter_internal_error) - message(FATAL_ERROR ${ARGV}) - endfunction() - - function(hunter_status_debug) - message(${ARGV}) - endfunction() -endif() - -function(hunter_add_rt_library target_name) - include(CheckCXXSymbolExists) - check_cxx_symbol_exists("clock_gettime" "time.h" _hunter_boost_have_clock_gettime) - if(_hunter_boost_have_clock_gettime) - return() - endif() - - include(CheckLibraryExists) # check_library_exists - check_library_exists(rt clock_gettime "" _hunter_boost_check_rt_library) - - if(_hunter_boost_check_rt_library) - set_property( - TARGET ${target_name} - APPEND PROPERTY INTERFACE_LINK_LIBRARIES rt - ) - endif() -endfunction(hunter_add_rt_library) - -hunter_status_debug("Boost find config") - -set(Boost_USE_STATIC_LIBS @BOOST_BUILD_STATIC@) -set(Boost_NO_BOOST_CMAKE YES) - -if(MSVC) - hunter_check_toolchain_definition(NAME "_DLL" DEFINED _hunter_vs_md) - if(_hunter_vs_md) - set(Boost_USE_STATIC_RUNTIME NO) - else() - set(Boost_USE_STATIC_RUNTIME YES) - endif() -endif() - -find_package(Boost MODULE REQUIRED ${Boost_FIND_COMPONENTS}) - -get_filename_component( - _root_path "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE -) - -if(NOT TARGET "Boost::boost") - add_library("Boost::boost" INTERFACE IMPORTED) - set_target_properties( - "Boost::boost" - PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${_root_path}/include" - ) - if(MSVC) - #stop MSVC from trying to auto-link libs - set(compile_definitions "BOOST_ALL_NO_LIB=1") - if(@BOOST_ALL_DYN_LINK@) #required for MSVC when using shared libs - list(APPEND compile_definitions "BOOST_ALL_DYN_LINK") - endif() - - set_target_properties( - "Boost::boost" - PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "${compile_definitions}" - ) - - endif() -endif() - -foreach(_boost_component ${Boost_FIND_COMPONENTS}) - set(_boost_lib "Boost::${_boost_component}") - if(NOT TARGET ${_boost_lib}) - add_library(${_boost_lib} STATIC IMPORTED) - - set_target_properties( - ${_boost_lib} PROPERTIES INTERFACE_LINK_LIBRARIES "Boost::boost" - ) - - # Debug library - string(TOUPPER "${_boost_component}" _lib_debug) - set(_lib_debug "${Boost_${_lib_debug}_LIBRARY_DEBUG}") - string(COMPARE EQUAL "${_lib_debug}" "" _is_empty) - if(_is_empty) - hunter_internal_error( - "Variable not set: Boost_${_lib_debug}_LIBRARY_DEBUG" - ) - endif() - if(NOT EXISTS "${_lib_debug}") - hunter_internal_error("Library not exists: ${_lib_debug}") - endif() - - set_property( - TARGET "${_boost_lib}" APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG - ) - set_target_properties( - "${_boost_lib}" - PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" - IMPORTED_LOCATION_DEBUG "${_lib_debug}" - ) - - # Release library - string(TOUPPER "${_boost_component}" _lib_release) - set(_lib_release "${Boost_${_lib_release}_LIBRARY_RELEASE}") - string(COMPARE EQUAL "${_lib_release}" "" _is_empty) - if(_is_empty) - hunter_internal_error( - "Variable not set: Boost_${_lib_release}_LIBRARY_RELEASE" - ) - endif() - if(NOT EXISTS "${_lib_release}") - hunter_internal_error("Library not exists: ${_lib_release}") - endif() - - set_property( - TARGET "${_boost_lib}" APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE - ) - set_target_properties( - "${_boost_lib}" - PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" - IMPORTED_LOCATION_RELEASE "${_lib_release}" - ) - - # Use Release version of library for MinSizeRel/RelWithDebInfo. - # TODO: how to deal with other (custom) build types? - set_target_properties( - "${_boost_lib}" - PROPERTIES - MAP_IMPORTED_CONFIG_MINSIZEREL Release - MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release - ) - endif() -endforeach() - -if(TARGET Boost::iostreams) - include("${CMAKE_CURRENT_LIST_DIR}/BoostZLIBDependency.cmake" OPTIONAL) - include("${CMAKE_CURRENT_LIST_DIR}/BoostBZip2Dependency.cmake" OPTIONAL) -endif() - -if(TARGET Boost::thread) - find_package(Threads REQUIRED) - set_property( - TARGET "Boost::thread" - APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads - ) - - hunter_add_rt_library(Boost::thread) -endif() - -if(TARGET Boost::chrono) - hunter_add_rt_library(Boost::chrono) -endif() - -if(TARGET Boost::log AND "@BUILD_SHARED_LIBS@") - set_property( - TARGET "Boost::log" - APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS BOOST_LOG_DYN_LINK - ) -endif() diff --git a/cmake/templates/BoostConfigVersion.cmake.in b/cmake/templates/BoostConfigVersion.cmake.in deleted file mode 100644 index a23cc8d582..0000000000 --- a/cmake/templates/BoostConfigVersion.cmake.in +++ /dev/null @@ -1,12 +0,0 @@ -# Copy/paste from automatically generated ConfigVersion.cmake - -set(PACKAGE_VERSION "@HUNTER_Boost_VERSION@") - -if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_COMPATIBLE FALSE) -else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if("${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}") - set(PACKAGE_VERSION_EXACT TRUE) - endif() -endif() diff --git a/cmake/templates/BoostZLIBDependency.cmake.in b/cmake/templates/BoostZLIBDependency.cmake.in deleted file mode 100644 index 2b8f93896a..0000000000 --- a/cmake/templates/BoostZLIBDependency.cmake.in +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2015, Ruslan Baratov -# All rights reserved. - -# Do not call 'hunter_add_package(ZLIB)' because ZLIB it not a basic dependency -find_package(ZLIB CONFIG REQUIRED) - -get_target_property( - _interface_link_libraries Boost::iostreams INTERFACE_LINK_LIBRARIES -) - -set_target_properties( - Boost::iostreams - PROPERTIES - INTERFACE_LINK_LIBRARIES "${_interface_link_libraries};ZLIB::zlib" -) diff --git a/docs/packages/pkg/Boost.rst b/docs/packages/pkg/Boost.rst index fc74cfa059..31545f8392 100644 --- a/docs/packages/pkg/Boost.rst +++ b/docs/packages/pkg/Boost.rst @@ -10,16 +10,10 @@ Boost # Header-only libraries hunter_add_package(Boost) find_package(Boost CONFIG REQUIRED) - target_link_libraries(... Boost::boost) + target_link_libraries(... Boost::headers) - `Example `__ -Since boost 1.70 you should use for header only libraries as target: - -.. code-block:: cmake - - target_link_libraries(... Boost::headers) - .. code-block:: cmake # Boost components (see list below) @@ -94,18 +88,8 @@ config file (``boost/config/user.hpp``): #define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS #define BOOST_MPL_LIMIT_LIST_SIZE 3 -- Option ``USE_CONFIG_FROM_BOOST=ON`` use the package configuration file provided - by the boost project. - - Since boost version 1.70.0, the boost project provide a well maintained package - configuration file for use with find_package's config mode. As minimum required CMake - version you need 3.3. - - See the difference between following example: - - - `Boost-log `__ - - - `Boost-log-useBoostConfig `__ +- Option ``USE_CONFIG_FROM_BOOST=ON`` was removed with Hunter ``v0.26.0``, + now the package configuration file is always provided by the Boost project. - Option ``BOOST_USE_WINAPI_VERSION=`` use on Windows in order to set the Windows API version used for building the boost libraries. diff --git a/examples/Boost-charconv/CMakeLists.txt b/examples/Boost-charconv/CMakeLists.txt index bae0b90020..13602a778b 100644 --- a/examples/Boost-charconv/CMakeLists.txt +++ b/examples/Boost-charconv/CMakeLists.txt @@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/../Boost-useBoostConfig/config.cmake) # Emulate HunterGate: # * https://github.com/cpp-pm/gate diff --git a/examples/Boost-chrono-1-64/CMakeLists.txt b/examples/Boost-chrono-1-64/CMakeLists.txt deleted file mode 100644 index 92ff148894..0000000000 --- a/examples/Boost-chrono-1-64/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(Boost-chrono-1_64_0) - -hunter_add_package(Boost COMPONENTS system chrono) -find_package(Boost CONFIG REQUIRED system chrono) - -add_executable(foo foo.cpp) -target_link_libraries( - foo - PUBLIC - Boost::chrono - Boost::system # Should be last - # Boost 1.66.0, Linux, Clang with -stdlib=libstdc++: - # * https://travis-ci.org/ingenue/hunter/jobs/318140468#L2651 -) diff --git a/examples/Boost-chrono-1-64/config.cmake b/examples/Boost-chrono-1-64/config.cmake deleted file mode 100644 index fb6a2c8bcd..0000000000 --- a/examples/Boost-chrono-1-64/config.cmake +++ /dev/null @@ -1,3 +0,0 @@ -hunter_config(Boost - VERSION 1.64.0 -) diff --git a/examples/Boost-chrono-1-64/foo.cpp b/examples/Boost-chrono-1-64/foo.cpp deleted file mode 100644 index 33c0516210..0000000000 --- a/examples/Boost-chrono-1-64/foo.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main() { - boost::chrono::system_clock::now(); - return 0; -} diff --git a/examples/Boost-chrono-useBoostConfig/CMakeLists.txt b/examples/Boost-chrono-useBoostConfig/CMakeLists.txt deleted file mode 100644 index aaf5fa5626..0000000000 --- a/examples/Boost-chrono-useBoostConfig/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(download-boost) - -hunter_add_package(Boost COMPONENTS chrono) -find_package(Boost CONFIG REQUIRED chrono) - -add_executable(foo foo.cpp) -target_link_libraries( - foo - PUBLIC - Boost::chrono -) diff --git a/examples/Boost-chrono-useBoostConfig/config.cmake b/examples/Boost-chrono-useBoostConfig/config.cmake deleted file mode 100644 index 9daa4a1d95..0000000000 --- a/examples/Boost-chrono-useBoostConfig/config.cmake +++ /dev/null @@ -1,4 +0,0 @@ -hunter_config(Boost - VERSION ${HUNTER_Boost_VERSION} - CMAKE_ARGS USE_CONFIG_FROM_BOOST=ON -) diff --git a/examples/Boost-chrono-useBoostConfig/foo.cpp b/examples/Boost-chrono-useBoostConfig/foo.cpp deleted file mode 100644 index 33c0516210..0000000000 --- a/examples/Boost-chrono-useBoostConfig/foo.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main() { - boost::chrono::system_clock::now(); - return 0; -} diff --git a/examples/Boost-chrono/CMakeLists.txt b/examples/Boost-chrono/CMakeLists.txt index 4a77b75f80..a85a397684 100644 --- a/examples/Boost-chrono/CMakeLists.txt +++ b/examples/Boost-chrono/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (c) 2013, Ruslan Baratov +# Copyright (c) 2025, NeroBurner # All rights reserved. cmake_minimum_required(VERSION 3.10) @@ -11,15 +12,12 @@ include("../common.cmake") project(download-boost) -hunter_add_package(Boost COMPONENTS system chrono) -find_package(Boost CONFIG REQUIRED system chrono) +hunter_add_package(Boost COMPONENTS chrono) +find_package(Boost CONFIG REQUIRED chrono) add_executable(foo foo.cpp) target_link_libraries( foo PUBLIC Boost::chrono - Boost::system # Should be last - # Boost 1.66.0, Linux, Clang with -stdlib=libstdc++: - # * https://travis-ci.org/ingenue/hunter/jobs/318140468#L2651 ) diff --git a/examples/Boost-cobalt/CMakeLists.txt b/examples/Boost-cobalt/CMakeLists.txt index d04cd92fb7..680de845e8 100644 --- a/examples/Boost-cobalt/CMakeLists.txt +++ b/examples/Boost-cobalt/CMakeLists.txt @@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/../Boost-useBoostConfig/config.cmake) set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/toolchain.cmake" CACHE FILEPATH "Path to CMake toolchain file") diff --git a/examples/Boost-container/config.cmake b/examples/Boost-container/config.cmake deleted file mode 100644 index 9daa4a1d95..0000000000 --- a/examples/Boost-container/config.cmake +++ /dev/null @@ -1,4 +0,0 @@ -hunter_config(Boost - VERSION ${HUNTER_Boost_VERSION} - CMAKE_ARGS USE_CONFIG_FROM_BOOST=ON -) diff --git a/examples/Boost-filesystem-1-64/CMakeLists.txt b/examples/Boost-filesystem-1-64/CMakeLists.txt deleted file mode 100644 index 4f799c2d40..0000000000 --- a/examples/Boost-filesystem-1-64/CMakeLists.txt +++ /dev/null @@ -1,60 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(Boost-filesystem-1_64_0) - -# download boost -hunter_add_package(Boost COMPONENTS system filesystem) - -# now boost can be used -find_package(Boost CONFIG REQUIRED system filesystem) - -if(ANDROID) - string(COMPARE EQUAL "${CMAKE_ANDROID_NDK}" "" is_empty) - if(is_empty) - message(FATAL_ERROR "CMAKE_ANDROID_NDK is empty") - endif() - add_library( - foo - SHARED - foo_android.cpp - "${CMAKE_ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c" - ) -else() - add_executable(foo foo.cpp) -endif() - -target_link_libraries(foo Boost::system Boost::filesystem) - -if(ANDROID) - target_link_libraries(foo log android) - target_include_directories( - foo PUBLIC "${CMAKE_ANDROID_NDK}/sources/android/native_app_glue" - ) - - if(NOT "$ENV{TRAVIS}") - # Travis CI failed builds: - # * https://travis-ci.org/ingenue/hunter/jobs/106905844 - # * https://travis-ci.org/ingenue/hunter/jobs/106905851 - hunter_add_package(Android-Apk) - list(APPEND CMAKE_MODULE_PATH "${ANDROID-APK_ROOT}") - include(AndroidApk) - - hunter_add_package(Android-SDK) - message("Path to `android`: ${ANDROID-SDK_ROOT}/android-sdk/tools/android") - message("Path to `emulator`: ${ANDROID-SDK_ROOT}/android-sdk/tools/emulator") - message("Path to `adb`: ${ANDROID-SDK_ROOT}/android-sdk/platform-tools/adb") - - android_create_apk( - BASE_TARGET foo - LAUNCH_TARGET foo-launch - DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/apk" - ) - endif() -endif() diff --git a/examples/Boost-filesystem-1-64/config.cmake b/examples/Boost-filesystem-1-64/config.cmake deleted file mode 100644 index fb6a2c8bcd..0000000000 --- a/examples/Boost-filesystem-1-64/config.cmake +++ /dev/null @@ -1,3 +0,0 @@ -hunter_config(Boost - VERSION 1.64.0 -) diff --git a/examples/Boost-filesystem-1-64/foo.cpp b/examples/Boost-filesystem-1-64/foo.cpp deleted file mode 100644 index 13f5f90676..0000000000 --- a/examples/Boost-filesystem-1-64/foo.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include // std::cout - -int main() { - namespace fs = boost::filesystem; - std::cout << "Current path: " << fs::current_path() << std::endl; -} diff --git a/examples/Boost-filesystem-1-64/foo_android.cpp b/examples/Boost-filesystem-1-64/foo_android.cpp deleted file mode 100644 index b86604683d..0000000000 --- a/examples/Boost-filesystem-1-64/foo_android.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2015, Ruslan Baratov -// All rights reserved. - -#include - -#include -#include - -void android_main(struct android_app* state) { - app_dummy(); // Make sure glue isn't stripped - - namespace fs = boost::filesystem; - - __android_log_print( - ANDROID_LOG_INFO, - "BoostFilesystemExample", - fs::current_path().c_str() - ); - - ANativeActivity_finish(state->activity); -} diff --git a/examples/Boost-filesystem-shared/CMakeLists.txt b/examples/Boost-filesystem-shared/CMakeLists.txt index 8512e2899d..cab74bd49c 100644 --- a/examples/Boost-filesystem-shared/CMakeLists.txt +++ b/examples/Boost-filesystem-shared/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (c) 2013-2015, Ruslan Baratov +# Copyright (c) 2025, NeroBurner # All rights reserved. cmake_minimum_required(VERSION 3.10) @@ -10,8 +11,8 @@ include("../common.cmake") project(download-boost) -hunter_add_package(Boost COMPONENTS system filesystem) -find_package(Boost CONFIG REQUIRED system filesystem) +# download boost +hunter_add_package(Boost COMPONENTS filesystem) add_executable(foo foo.cpp) -target_link_libraries(foo PUBLIC Boost::system Boost::filesystem) +target_link_libraries(foo Boost::filesystem) diff --git a/examples/Boost-filesystem-shared/config.cmake b/examples/Boost-filesystem-shared/config.cmake index f9ab533253..334dd54e5f 100644 --- a/examples/Boost-filesystem-shared/config.cmake +++ b/examples/Boost-filesystem-shared/config.cmake @@ -1,4 +1,4 @@ hunter_config(Boost VERSION ${HUNTER_Boost_VERSION} - CMAKE_ARGS BUILD_SHARED_LIBS=ON USE_CONFIG_FROM_BOOST=ON + CMAKE_ARGS BUILD_SHARED_LIBS=ON ) diff --git a/examples/Boost-filesystem-useBoostConfig/CMakeLists.txt b/examples/Boost-filesystem-useBoostConfig/CMakeLists.txt deleted file mode 100644 index 001ded9983..0000000000 --- a/examples/Boost-filesystem-useBoostConfig/CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(download-boost) - -# download boost -hunter_add_package(Boost COMPONENTS filesystem) - -# now boost can be used -find_package(Boost CONFIG REQUIRED filesystem) - -if(ANDROID) - string(COMPARE EQUAL "${CMAKE_ANDROID_NDK}" "" is_empty) - if(is_empty) - message(FATAL_ERROR "CMAKE_ANDROID_NDK is empty") - endif() - add_library( - foo - SHARED - foo_android.cpp - "${CMAKE_ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c" - ) -else() - add_executable(foo foo.cpp) -endif() - -target_link_libraries( - foo - Boost::filesystem -) - -if(ANDROID) - target_link_libraries(foo log android) - target_include_directories( - foo PUBLIC "${CMAKE_ANDROID_NDK}/sources/android/native_app_glue" - ) - - if(NOT "$ENV{TRAVIS}") - # Travis CI failed builds: - # * https://travis-ci.org/ingenue/hunter/jobs/106905844 - # * https://travis-ci.org/ingenue/hunter/jobs/106905851 - hunter_add_package(Android-Apk) - list(APPEND CMAKE_MODULE_PATH "${ANDROID-APK_ROOT}") - include(AndroidApk) - - hunter_add_package(Android-SDK) - message("Path to `android`: ${ANDROID-SDK_ROOT}/android-sdk/tools/android") - message("Path to `emulator`: ${ANDROID-SDK_ROOT}/android-sdk/tools/emulator") - message("Path to `adb`: ${ANDROID-SDK_ROOT}/android-sdk/platform-tools/adb") - - android_create_apk( - BASE_TARGET foo - LAUNCH_TARGET foo-launch - DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/apk" - ) - endif() -endif() diff --git a/examples/Boost-filesystem-useBoostConfig/config.cmake b/examples/Boost-filesystem-useBoostConfig/config.cmake deleted file mode 100644 index 9daa4a1d95..0000000000 --- a/examples/Boost-filesystem-useBoostConfig/config.cmake +++ /dev/null @@ -1,4 +0,0 @@ -hunter_config(Boost - VERSION ${HUNTER_Boost_VERSION} - CMAKE_ARGS USE_CONFIG_FROM_BOOST=ON -) diff --git a/examples/Boost-filesystem-useBoostConfig/foo.cpp b/examples/Boost-filesystem-useBoostConfig/foo.cpp deleted file mode 100644 index 13f5f90676..0000000000 --- a/examples/Boost-filesystem-useBoostConfig/foo.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include // std::cout - -int main() { - namespace fs = boost::filesystem; - std::cout << "Current path: " << fs::current_path() << std::endl; -} diff --git a/examples/Boost-filesystem-useBoostConfig/foo_android.cpp b/examples/Boost-filesystem-useBoostConfig/foo_android.cpp deleted file mode 100644 index b86604683d..0000000000 --- a/examples/Boost-filesystem-useBoostConfig/foo_android.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2015, Ruslan Baratov -// All rights reserved. - -#include - -#include -#include - -void android_main(struct android_app* state) { - app_dummy(); // Make sure glue isn't stripped - - namespace fs = boost::filesystem; - - __android_log_print( - ANDROID_LOG_INFO, - "BoostFilesystemExample", - fs::current_path().c_str() - ); - - ANativeActivity_finish(state->activity); -} diff --git a/examples/Boost-filesystem/CMakeLists.txt b/examples/Boost-filesystem/CMakeLists.txt index 105617bf95..548440a71b 100644 --- a/examples/Boost-filesystem/CMakeLists.txt +++ b/examples/Boost-filesystem/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (c) 2013-2015, Ruslan Baratov +# Copyright (c) 2025, NeroBurner # All rights reserved. cmake_minimum_required(VERSION 3.10) @@ -12,10 +13,10 @@ include("../common.cmake") project(download-boost) # download boost -hunter_add_package(Boost COMPONENTS system filesystem) +hunter_add_package(Boost COMPONENTS filesystem) # now boost can be used -find_package(Boost CONFIG REQUIRED system filesystem) +find_package(Boost CONFIG REQUIRED filesystem) if(ANDROID) string(COMPARE EQUAL "${CMAKE_ANDROID_NDK}" "" is_empty) @@ -35,9 +36,6 @@ endif() target_link_libraries( foo Boost::filesystem - Boost::system # Should be last - # Boost 1.66.0, Linux, Clang with -stdlib=libstdc++: - # * https://travis-ci.org/ingenue/hunter/jobs/318140416#L2674 ) if(ANDROID) diff --git a/examples/Boost-iostreams-1-64/CMakeLists.txt b/examples/Boost-iostreams-1-64/CMakeLists.txt deleted file mode 100644 index 661dd2f190..0000000000 --- a/examples/Boost-iostreams-1-64/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(Boost-iostreams-1_64_0) - -hunter_add_package(Boost COMPONENTS iostreams serialization) -find_package(Boost CONFIG REQUIRED iostreams serialization) - -add_executable(foo foo.cpp) -target_link_libraries(foo PUBLIC Boost::iostreams Boost::serialization) diff --git a/examples/Boost-iostreams-1-64/config.cmake b/examples/Boost-iostreams-1-64/config.cmake deleted file mode 100644 index 28fec7bdc6..0000000000 --- a/examples/Boost-iostreams-1-64/config.cmake +++ /dev/null @@ -1 +0,0 @@ -hunter_config(Boost VERSION 1.64.0) diff --git a/examples/Boost-iostreams-1-64/foo.cpp b/examples/Boost-iostreams-1-64/foo.cpp deleted file mode 100644 index f49eb2a8fb..0000000000 --- a/examples/Boost-iostreams-1-64/foo.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) 2015, David Hirvonen -// All rights reserved. - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -struct Record -{ - Record() {} - Record(int age, const std::string &name) : age(age), name(name) {} - - int age; - std::string name; - - // Boost serialization: - //friend class boost::serialization::access; - template void serialize(Archive & ar, const unsigned int version) - { - ar & age; - ar & name; - } -}; - -int main(int argc, char **argv) -{ - std::string filename = "/tmp/record.dat"; - - typedef boost::iostreams::zlib_compressor Compressor; - typedef boost::iostreams::zlib_decompressor Decompressor; - - { // Dump the record: - Record record(1, "kermit"); - std::ofstream ofs(filename, std::ios_base::out | std::ios_base::binary); - if(ofs) - { - boost::iostreams::filtering_stream buffer; - buffer.push(Compressor()); - buffer.push(ofs); - boost::archive::binary_oarchive oa(buffer); - oa << record; - } - } - - { // Load the record - Record record; - std::ifstream ifs(filename, std::ios_base::in | std::ios_base::binary); - if(ifs) - { - boost::iostreams::filtering_streambuf buffer; - buffer.push(Decompressor()); - buffer.push(ifs); - boost::archive::binary_iarchive ia(buffer); // (ifs); - ia >> record; - } - } -} - diff --git a/examples/Boost-iostreams-useBoostConfig/CMakeLists.txt b/examples/Boost-iostreams-useBoostConfig/CMakeLists.txt deleted file mode 100644 index 1fd7214c9b..0000000000 --- a/examples/Boost-iostreams-useBoostConfig/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(boost_iostreams) - -hunter_add_package(Boost COMPONENTS iostreams serialization) -# If you use boost/iostreams/filter/gzip.hpp then you should add ZLIB -find_package(ZLIB CONFIG REQUIRED) -# If you use boost/iostreams/filter/bzip2.hpp then you should add BZip2 -find_package(BZip2 CONFIG REQUIRED) -find_package(Boost CONFIG REQUIRED iostreams serialization) - -add_executable(foo foo.cpp) -target_link_libraries(foo PUBLIC Boost::iostreams Boost::serialization ZLIB::zlib BZip2::bz2) diff --git a/examples/Boost-iostreams-useBoostConfig/config.cmake b/examples/Boost-iostreams-useBoostConfig/config.cmake deleted file mode 100644 index 9daa4a1d95..0000000000 --- a/examples/Boost-iostreams-useBoostConfig/config.cmake +++ /dev/null @@ -1,4 +0,0 @@ -hunter_config(Boost - VERSION ${HUNTER_Boost_VERSION} - CMAKE_ARGS USE_CONFIG_FROM_BOOST=ON -) diff --git a/examples/Boost-iostreams-useBoostConfig/foo.cpp b/examples/Boost-iostreams-useBoostConfig/foo.cpp deleted file mode 100644 index f49eb2a8fb..0000000000 --- a/examples/Boost-iostreams-useBoostConfig/foo.cpp +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) 2015, David Hirvonen -// All rights reserved. - -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -struct Record -{ - Record() {} - Record(int age, const std::string &name) : age(age), name(name) {} - - int age; - std::string name; - - // Boost serialization: - //friend class boost::serialization::access; - template void serialize(Archive & ar, const unsigned int version) - { - ar & age; - ar & name; - } -}; - -int main(int argc, char **argv) -{ - std::string filename = "/tmp/record.dat"; - - typedef boost::iostreams::zlib_compressor Compressor; - typedef boost::iostreams::zlib_decompressor Decompressor; - - { // Dump the record: - Record record(1, "kermit"); - std::ofstream ofs(filename, std::ios_base::out | std::ios_base::binary); - if(ofs) - { - boost::iostreams::filtering_stream buffer; - buffer.push(Compressor()); - buffer.push(ofs); - boost::archive::binary_oarchive oa(buffer); - oa << record; - } - } - - { // Load the record - Record record; - std::ifstream ifs(filename, std::ios_base::in | std::ios_base::binary); - if(ifs) - { - boost::iostreams::filtering_streambuf buffer; - buffer.push(Decompressor()); - buffer.push(ifs); - boost::archive::binary_iarchive ia(buffer); // (ifs); - ia >> record; - } - } -} - diff --git a/examples/Boost-iostreams/CMakeLists.txt b/examples/Boost-iostreams/CMakeLists.txt index 2bcc85036c..f61a407ccc 100644 --- a/examples/Boost-iostreams/CMakeLists.txt +++ b/examples/Boost-iostreams/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (c) 2015, Aaditya Kalsi +# Copyright (c) 2025, NeroBurner # All rights reserved. cmake_minimum_required(VERSION 3.10) @@ -12,7 +13,11 @@ include("../common.cmake") project(boost_iostreams) hunter_add_package(Boost COMPONENTS iostreams serialization) +# If you use boost/iostreams/filter/gzip.hpp then you should add ZLIB +find_package(ZLIB CONFIG REQUIRED) +# If you use boost/iostreams/filter/bzip2.hpp then you should add BZip2 +find_package(BZip2 CONFIG REQUIRED) find_package(Boost CONFIG REQUIRED iostreams serialization) add_executable(foo foo.cpp) -target_link_libraries(foo PUBLIC Boost::iostreams Boost::serialization) +target_link_libraries(foo PUBLIC Boost::iostreams Boost::serialization ZLIB::zlib BZip2::bz2) diff --git a/examples/Boost-log-shared/CMakeLists.txt b/examples/Boost-log-shared/CMakeLists.txt index 81c2e52189..013a2ced77 100644 --- a/examples/Boost-log-shared/CMakeLists.txt +++ b/examples/Boost-log-shared/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (c) 2013-2017, Ruslan Baratov +# Copyright (c) 2025, NeroBurner # All rights reserved. cmake_minimum_required(VERSION 3.10) @@ -12,19 +13,8 @@ include("../common.cmake") project(download-boost) -hunter_add_package(Boost COMPONENTS log filesystem system chrono thread regex date_time atomic) -find_package(Boost CONFIG REQUIRED log filesystem system chrono thread regex date_time atomic) +hunter_add_package(Boost COMPONENTS log) +find_package(Boost CONFIG REQUIRED log) add_executable(foo foo.cpp) -target_link_libraries(foo - PUBLIC - Boost::log - Boost::filesystem - Boost::system - Boost::chrono - Boost::thread - Boost::regex - Boost::date_time - Boost::atomic - Boost::boost -) +target_link_libraries(foo PUBLIC Boost::log) diff --git a/examples/Boost-log-useBoostConfig/CMakeLists.txt b/examples/Boost-log-useBoostConfig/CMakeLists.txt deleted file mode 100644 index 3aa3da3e62..0000000000 --- a/examples/Boost-log-useBoostConfig/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(download-boost) - -hunter_add_package(Boost COMPONENTS log) -find_package(Boost CONFIG REQUIRED log) - -add_executable(foo foo.cpp) -target_link_libraries(foo PUBLIC Boost::log) diff --git a/examples/Boost-log-useBoostConfig/config.cmake b/examples/Boost-log-useBoostConfig/config.cmake deleted file mode 100644 index 9daa4a1d95..0000000000 --- a/examples/Boost-log-useBoostConfig/config.cmake +++ /dev/null @@ -1,4 +0,0 @@ -hunter_config(Boost - VERSION ${HUNTER_Boost_VERSION} - CMAKE_ARGS USE_CONFIG_FROM_BOOST=ON -) diff --git a/examples/Boost-log-useBoostConfig/foo.cpp b/examples/Boost-log-useBoostConfig/foo.cpp deleted file mode 100644 index 1f56b3f693..0000000000 --- a/examples/Boost-log-useBoostConfig/foo.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include - -int main() { - BOOST_LOG_TRIVIAL(trace) << "A trace severity message"; - BOOST_LOG_TRIVIAL(debug) << "A debug severity message"; - BOOST_LOG_TRIVIAL(info) << "An informational severity message"; - BOOST_LOG_TRIVIAL(warning) << "A warning severity message"; - BOOST_LOG_TRIVIAL(error) << "An error severity message"; - BOOST_LOG_TRIVIAL(fatal) << "A fatal severity message"; - - return 0; -} diff --git a/examples/Boost-log/CMakeLists.txt b/examples/Boost-log/CMakeLists.txt index e19f1cd173..2367c48edc 100644 --- a/examples/Boost-log/CMakeLists.txt +++ b/examples/Boost-log/CMakeLists.txt @@ -1,4 +1,5 @@ # Copyright (c) 2013-2017, Ruslan Baratov +# Copyright (c) 2025, NeroBurner # All rights reserved. cmake_minimum_required(VERSION 3.10) @@ -11,17 +12,8 @@ include("../common.cmake") project(download-boost) -hunter_add_package(Boost COMPONENTS log filesystem system chrono thread regex date_time atomic) -find_package(Boost CONFIG REQUIRED log filesystem system chrono thread regex date_time atomic) +hunter_add_package(Boost COMPONENTS log) +find_package(Boost CONFIG REQUIRED log) add_executable(foo foo.cpp) -target_link_libraries(foo PUBLIC Boost::log - Boost::filesystem - Boost::chrono - Boost::thread - Boost::regex - Boost::date_time - Boost::atomic - Boost::system - Boost::boost -) +target_link_libraries(foo PUBLIC Boost::log) diff --git a/examples/Boost-predef/CMakeLists.txt b/examples/Boost-predef/CMakeLists.txt index 139e35c6d1..ec54650aad 100644 --- a/examples/Boost-predef/CMakeLists.txt +++ b/examples/Boost-predef/CMakeLists.txt @@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/../Boost-useBoostConfig/config.cmake) # Emulate HunterGate: # * https://github.com/cpp-pm/gate diff --git a/examples/Boost-process/CMakeLists.txt b/examples/Boost-process/CMakeLists.txt index 19f243335d..a16e533510 100644 --- a/examples/Boost-process/CMakeLists.txt +++ b/examples/Boost-process/CMakeLists.txt @@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/../Boost-useBoostConfig/config.cmake) # Emulate HunterGate: # * https://github.com/cpp-pm/gate diff --git a/examples/Boost-redis/CMakeLists.txt b/examples/Boost-redis/CMakeLists.txt index 2bfddf5151..ef6022dcc5 100644 --- a/examples/Boost-redis/CMakeLists.txt +++ b/examples/Boost-redis/CMakeLists.txt @@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/../Boost-useBoostConfig/config.cmake) set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/toolchain.cmake" CACHE FILEPATH "Path to CMake toolchain file") diff --git a/examples/Boost-system-1-66/CMakeLists.txt b/examples/Boost-system-1-66/CMakeLists.txt deleted file mode 100644 index 62ef6d2257..0000000000 --- a/examples/Boost-system-1-66/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(Boost-system-1_66) - -hunter_add_package(Boost COMPONENTS system) -find_package(Boost CONFIG REQUIRED system) - -add_executable(foo foo.cpp) -target_link_libraries(foo PUBLIC Boost::system) diff --git a/examples/Boost-system-1-66/config.cmake b/examples/Boost-system-1-66/config.cmake deleted file mode 100644 index 853a6f287d..0000000000 --- a/examples/Boost-system-1-66/config.cmake +++ /dev/null @@ -1 +0,0 @@ -hunter_config(Boost VERSION 1.66.0) diff --git a/examples/Boost-system-1-66/foo.cpp b/examples/Boost-system-1-66/foo.cpp deleted file mode 100644 index 7bb6d3bcbc..0000000000 --- a/examples/Boost-system-1-66/foo.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include - -int main() { -} diff --git a/examples/Boost-thread-1-64/CMakeLists.txt b/examples/Boost-thread-1-64/CMakeLists.txt deleted file mode 100644 index 9d90464fca..0000000000 --- a/examples/Boost-thread-1-64/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(Boost-thread-1_64_0) - -hunter_add_package(Boost COMPONENTS system thread) -find_package(Boost CONFIG REQUIRED system thread) - -add_executable(foo foo.cpp) -target_link_libraries(foo PUBLIC Boost::system Boost::thread) diff --git a/examples/Boost-thread-1-64/config.cmake b/examples/Boost-thread-1-64/config.cmake deleted file mode 100644 index fb6a2c8bcd..0000000000 --- a/examples/Boost-thread-1-64/config.cmake +++ /dev/null @@ -1,3 +0,0 @@ -hunter_config(Boost - VERSION 1.64.0 -) diff --git a/examples/Boost-thread-1-64/foo.cpp b/examples/Boost-thread-1-64/foo.cpp deleted file mode 100644 index 811dcb8b0b..0000000000 --- a/examples/Boost-thread-1-64/foo.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef BOOST_THREAD_PROVIDES_FUTURE -#define BOOST_THREAD_PROVIDES_FUTURE -#endif -// #ifndef BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION -// #define BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION -// #endif -// #ifndef BOOST_THREAD_PROVIDES_FUTURE_WHEN_ALL_WHEN_ANY -// #define BOOST_THREAD_PROVIDES_FUTURE_WHEN_ALL_WHEN_ANY -// #endif - - -#include -#include - - -int calculate_the_answer_to_life_the_universe_and_everything() -{ - return 42; -} - - - -int main() { - boost::packaged_task pt(calculate_the_answer_to_life_the_universe_and_everything); - boost:: future fi=pt.get_future(); - - boost::thread task(boost::move(pt)); // launch task on a thread - - fi.wait(); // wait for it to finish - - assert(fi.is_ready()); - assert(fi.has_value()); - assert(!fi.has_exception()); - assert(fi.get_state()==boost::future_state::ready); - assert(fi.get()==42); -} diff --git a/examples/Boost-useBoostConfig/CMakeLists.txt b/examples/Boost-useBoostConfig/CMakeLists.txt deleted file mode 100644 index 2f1e33500c..0000000000 --- a/examples/Boost-useBoostConfig/CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -cmake_minimum_required(VERSION 3.10) - -set(Boost_DEBUG ON CACHE BOOLEAN "") -set(TESTING_CONFIG_OPT FILEPATH ${CMAKE_CURRENT_LIST_DIR}/config.cmake) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(download-boost) - -hunter_add_package(Boost) -find_package(Boost CONFIG REQUIRED) - -add_executable(foo foo.cpp) -target_link_libraries(foo PUBLIC Boost::headers) # Since boost 1.70 you should use Boost::headers as target - -set(project_license "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt") -file( - WRITE - "${project_license}" - "Some info about this project license.\n\n" -) - -string(COMPARE EQUAL "${Boost_LICENSES}" "" is_empty) -if(is_empty) - message(FATAL_ERROR "No licenses") -endif() - -file(APPEND "${project_license}" "== 3rd party licenses ==\n\n") - -foreach(x ${Boost_LICENSES}) - file(READ "${x}" content) - get_filename_component(license_name "${x}" NAME) - file(APPEND "${project_license}" "== Boost (${license_name}) ==\n\n") - file(APPEND "${project_license}" "${content}") -endforeach() - -message("Project license: ${project_license}") - -file(GLOB_RECURSE boost_configs "${BOOST_ROOT}/*/BoostConfig.cmake") -list(LENGTH boost_configs len) -if(NOT len EQUAL "1") - message(FATAL_ERROR "More than one *Config: ${boost_configs}") -endif() diff --git a/examples/Boost-useBoostConfig/config.cmake b/examples/Boost-useBoostConfig/config.cmake deleted file mode 100644 index 9daa4a1d95..0000000000 --- a/examples/Boost-useBoostConfig/config.cmake +++ /dev/null @@ -1,4 +0,0 @@ -hunter_config(Boost - VERSION ${HUNTER_Boost_VERSION} - CMAKE_ARGS USE_CONFIG_FROM_BOOST=ON -) diff --git a/examples/Boost-useBoostConfig/foo.cpp b/examples/Boost-useBoostConfig/foo.cpp deleted file mode 100644 index 28f9a77ef2..0000000000 --- a/examples/Boost-useBoostConfig/foo.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include - -int main() { -} diff --git a/examples/Boost/CMakeLists.txt b/examples/Boost/CMakeLists.txt index e7c486a606..450b0b5e3f 100644 --- a/examples/Boost/CMakeLists.txt +++ b/examples/Boost/CMakeLists.txt @@ -15,7 +15,7 @@ hunter_add_package(Boost) find_package(Boost CONFIG REQUIRED) add_executable(foo foo.cpp) -target_link_libraries(foo PUBLIC Boost::boost) # Since boost 1.70 you should use Boost::headers as target +target_link_libraries(foo PUBLIC Boost::headers) set(project_license "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt") file(