Skip to content

Commit f6d9900

Browse files
NeroBurnerNeroBurner
committed
Boost: remove USE_CONFIG_FROM_BOOST hunter option, remove old
Remove the option `USE_BOOST_CONFIG`. It is now essentially always enabled. Remove all Boost versions older than 1.72, as the old versions don't supply a `BoostConfig.cmake` file yet. Remove the code and templates to create a `BoostConfig.cmake` with Hunter. Update the examples and remove the `-useBoostConfig` example folders. Fixes: #723
1 parent 0ddc5ce commit f6d9900

File tree

90 files changed

+119
-1431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+119
-1431
lines changed

‎cmake/configs/default.cmake

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,7 @@ hunter_default_version(Async++ VERSION 0.0.3-hunter)
3333
hunter_default_version(Avahi VERSION 0.6.31)
3434
hunter_default_version(BZip2 VERSION 1.0.8-p0)
3535
hunter_default_version(Beast VERSION 1.0.0-b84-hunter-0)
36-
37-
if(MINGW)
38-
# https://github.com/boostorg/build/issues/301
39-
hunter_default_version(Boost VERSION 1.64.0)
40-
else()
41-
hunter_default_version(Boost VERSION 1.86.0)
42-
endif()
43-
36+
hunter_default_version(Boost VERSION 1.86.0)
4437
hunter_default_version(BoostCompute VERSION 0.5-p0)
4538
hunter_default_version(BoostProcess VERSION 0.5)
4639
hunter_default_version(BoringSSL VERSION 0.0.0-0f5ecd3a8-p0)

‎cmake/modules/hunter_install_boost_config.cmake

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎cmake/projects/Boost/atomic/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
atomic
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/charconv/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
charconv
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/chrono/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
chrono
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/ci/matrix.json

Lines changed: 39 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,19 @@
1313
{ "example": "Boost", "toolchain": "mingw-cxx17", "os": "windows-2022" },
1414
{ "example": "Boost", "toolchain": "msys-cxx17", "os": "windows-2022" },
1515

16-
{ "example": "Boost-useBoostConfig", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" },
17-
{ "example": "Boost-useBoostConfig", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" },
18-
{ "example": "Boost-useBoostConfig", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" },
19-
{ "example": "Boost-useBoostConfig", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" },
20-
{ "example": "Boost-useBoostConfig", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" },
21-
{ "example": "Boost-useBoostConfig", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" },
22-
{ "example": "Boost-useBoostConfig", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" },
23-
{ "example": "Boost-useBoostConfig", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" },
24-
{ "example": "Boost-useBoostConfig", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" },
25-
{ "example": "Boost-useBoostConfig", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" },
26-
{ "example": "Boost-useBoostConfig", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" },
27-
{ "example": "Boost-useBoostConfig", "toolchain": "mingw-cxx17", "os": "windows-2022" },
28-
{ "example": "Boost-useBoostConfig", "toolchain": "msys-cxx17", "os": "windows-2022" },
29-
30-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" },
31-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" },
32-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" },
33-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" },
34-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" },
35-
// { "example": "Boost-chrono-useBoostConfig", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" },
36-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" },
37-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" },
38-
// { "example": "Boost-chrono-useBoostConfig", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" },
39-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" },
40-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" },
41-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "mingw-cxx17", "os": "windows-2022" },
42-
{ "example": "Boost-chrono-useBoostConfig", "toolchain": "msys-cxx17", "os": "windows-2022" },
16+
{ "example": "Boost-chrono", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" },
17+
{ "example": "Boost-chrono", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" },
18+
{ "example": "Boost-chrono", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" },
19+
{ "example": "Boost-chrono", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" },
20+
{ "example": "Boost-chrono", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" },
21+
// { "example": "Boost-chrono", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" },
22+
{ "example": "Boost-chrono", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" },
23+
{ "example": "Boost-chrono", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" },
24+
// { "example": "Boost-chrono", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" },
25+
{ "example": "Boost-chrono", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" },
26+
{ "example": "Boost-chrono", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" },
27+
{ "example": "Boost-chrono", "toolchain": "mingw-cxx17", "os": "windows-2022" },
28+
{ "example": "Boost-chrono", "toolchain": "msys-cxx17", "os": "windows-2022" },
4329

4430
// { "example": "Boost-charconv", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" },
4531
{ "example": "Boost-charconv", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" },
@@ -111,19 +97,19 @@
11197
{ "example": "Boost-fiber", "toolchain": "mingw-cxx17", "os": "windows-2022" },
11298
{ "example": "Boost-fiber", "toolchain": "msys-cxx17", "os": "windows-2022" },
11399

114-
{ "example": "Boost-filesystem-useBoostConfig", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" },
115-
// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" },
116-
// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" },
117-
// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" },
118-
{ "example": "Boost-filesystem-useBoostConfig", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" },
119-
// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" },
120-
{ "example": "Boost-filesystem-useBoostConfig", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" },
121-
// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" },
122-
// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" },
123-
// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" },
124-
// { "example": "Boost-filesystem-useBoostConfig", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" },
125-
{ "example": "Boost-filesystem-useBoostConfig", "toolchain": "mingw-cxx17", "os": "windows-2022" },
126-
{ "example": "Boost-filesystem-useBoostConfig", "toolchain": "msys-cxx17", "os": "windows-2022" },
100+
{ "example": "Boost-filesystem", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" },
101+
// { "example": "Boost-filesystem", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" },
102+
// { "example": "Boost-filesystem", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" },
103+
// { "example": "Boost-filesystem", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" },
104+
{ "example": "Boost-filesystem", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" },
105+
// { "example": "Boost-filesystem", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" },
106+
{ "example": "Boost-filesystem", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" },
107+
// { "example": "Boost-filesystem", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" },
108+
// { "example": "Boost-filesystem", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" },
109+
// { "example": "Boost-filesystem", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" },
110+
// { "example": "Boost-filesystem", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" },
111+
{ "example": "Boost-filesystem", "toolchain": "mingw-cxx17", "os": "windows-2022" },
112+
{ "example": "Boost-filesystem", "toolchain": "msys-cxx17", "os": "windows-2022" },
127113

128114
// { "example": "Boost-json", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" },
129115
{ "example": "Boost-json", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" },
@@ -139,19 +125,19 @@
139125
{ "example": "Boost-json", "toolchain": "mingw-cxx17", "os": "windows-2022" },
140126
{ "example": "Boost-json", "toolchain": "msys-cxx17", "os": "windows-2022" },
141127

142-
// { "example": "Boost-log-useBoostConfig", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" },
143-
// { "example": "Boost-log-useBoostConfig", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" },
144-
{ "example": "Boost-log-useBoostConfig", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" },
145-
// { "example": "Boost-log-useBoostConfig", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" },
146-
{ "example": "Boost-log-useBoostConfig", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" },
147-
// { "example": "Boost-log-useBoostConfig", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" },
148-
{ "example": "Boost-log-useBoostConfig", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" },
149-
{ "example": "Boost-log-useBoostConfig", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" },
150-
// { "example": "Boost-log-useBoostConfig", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" },
151-
{ "example": "Boost-log-useBoostConfig", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" },
152-
// { "example": "Boost-log-useBoostConfig", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" },
153-
{ "example": "Boost-log-useBoostConfig", "toolchain": "mingw-cxx17", "os": "windows-2022" },
154-
{ "example": "Boost-log-useBoostConfig", "toolchain": "msys-cxx17", "os": "windows-2022" },
128+
// { "example": "Boost-log", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" },
129+
// { "example": "Boost-log", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" },
130+
{ "example": "Boost-log", "toolchain": "gcc-13-cxx17-fpic", "os": "ubuntu-24.04" },
131+
// { "example": "Boost-log", "toolchain": "gcc-14-cxx17-fpic", "os": "ubuntu-24.04" },
132+
{ "example": "Boost-log", "toolchain": "android-ndk-api-35-arm64-v8a-libcxx14", "os": "ubuntu-24.04" },
133+
// { "example": "Boost-log", "toolchain": "osx-15-4-arch-universal2-cxx17", "os": "macos-15" },
134+
{ "example": "Boost-log", "toolchain": "ios-nocodesign-17-5-arm64-cxx17", "os": "macos-15" },
135+
{ "example": "Boost-log", "toolchain": "ninja-vs-17-2022-win64-cxx17", "os": "windows-2022" },
136+
// { "example": "Boost-log", "toolchain": "nmake-vs-17-2022-win64-cxx17", "os": "windows-2022" },
137+
{ "example": "Boost-log", "toolchain": "vs-17-2022-win64-sdk-10-0-22000-0-cxx17", "os": "windows-2022" },
138+
// { "example": "Boost-log", "toolchain": "vs-17-2022-win64-store-10-cxx17", "os": "windows-2022" },
139+
{ "example": "Boost-log", "toolchain": "mingw-cxx17", "os": "windows-2022" },
140+
{ "example": "Boost-log", "toolchain": "msys-cxx17", "os": "windows-2022" },
155141

156142
// { "example": "Boost-math", "toolchain": "clang-cxx17", "os": "ubuntu-24.04" },
157143
// { "example": "Boost-math", "toolchain": "gcc-12-cxx17", "os": "ubuntu-24.04" },

‎cmake/projects/Boost/cobalt/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
cobalt
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/container/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
container
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/context/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
context
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/contract/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
contract
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/coroutine/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
coroutine
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/date_time/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
date_time
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/exception/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
exception
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/fiber/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
fiber
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/filesystem/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
filesystem
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/graph/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
graph
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

‎cmake/projects/Boost/graph_parallel/hunter.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ hunter_download(
1818
Boost
1919
PACKAGE_COMPONENT
2020
graph_parallel
21-
PACKAGE_INTERNAL_DEPS_ID "50"
21+
PACKAGE_INTERNAL_DEPS_ID "51"
2222
)

0 commit comments

Comments
 (0)