Skip to content

Commit bcf3d00

Browse files
Neumann-ACheney-W
Neumann-A
and
Cheney-W
authored
[Boost] use cmake build (#32309)
~~arm64-windows: boost-context builds are blocked by a cmake bug (see https://gitlab.kitware.com/cmake/cmake/-/issues/24317)~~ closes #32274 closes Neumann-A/my-vcpkg-triplets#5 Questions: - [x] ~~Move cmake files to `share/cmake/<name>` ?~~ Not doing it because it is just using `vcpkg_cmake_config_fixup()` - [x] Fix weak dependencies (uwp|emscripten|android|arm)? - [x] Fix library names on !x64 (currently hardcoded to x64 or x86; failure in aricpp since it forces FindBoost module mode.) - [x] ~~Fix arm64-windows boost-context builds -> requires CMake (3.19.2?) update due to bug how the assembler is invoked.~~ (-> CI baseline for now) TODO: - [x] adjust generate ports script - [x] #37457 --------- Co-authored-by: Cheney-Wang <850426846@qq.com>
1 parent dcfbe90 commit bcf3d00

536 files changed

Lines changed: 3845 additions & 2674 deletions

File tree

Some content is hidden

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

‎ports/boost-accumulators/portfile.cmake‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ vcpkg_from_github(
88
HEAD_REF master
99
)
1010

11-
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
12-
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
11+
set(FEATURE_OPTIONS "")
12+
boost_configure_and_install(
13+
SOURCE_PATH "${SOURCE_PATH}"
14+
OPTIONS ${FEATURE_OPTIONS}
15+
)

‎ports/boost-accumulators/vcpkg.json‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-accumulators",
44
"version": "1.84.0",
5+
"port-version": 1,
56
"description": "Boost accumulators module",
67
"homepage": "https://github.com/boostorg/accumulators",
78
"license": "BSL-1.0",
@@ -18,6 +19,10 @@
1819
"name": "boost-circular-buffer",
1920
"version>=": "1.84.0"
2021
},
22+
{
23+
"name": "boost-cmake",
24+
"version>=": "1.84.0"
25+
},
2126
{
2227
"name": "boost-concept-check",
2328
"version>=": "1.84.0"
@@ -34,6 +39,10 @@
3439
"name": "boost-fusion",
3540
"version>=": "1.84.0"
3641
},
42+
{
43+
"name": "boost-headers",
44+
"version>=": "1.84.0"
45+
},
3746
{
3847
"name": "boost-iterator",
3948
"version>=": "1.84.0"
@@ -85,10 +94,6 @@
8594
{
8695
"name": "boost-ublas",
8796
"version>=": "1.84.0"
88-
},
89-
{
90-
"name": "boost-vcpkg-helpers",
91-
"version>=": "1.84.0"
9297
}
9398
]
9499
}

‎ports/boost-algorithm/portfile.cmake‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ vcpkg_from_github(
88
HEAD_REF master
99
)
1010

11-
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
12-
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
11+
set(FEATURE_OPTIONS "")
12+
boost_configure_and_install(
13+
SOURCE_PATH "${SOURCE_PATH}"
14+
OPTIONS ${FEATURE_OPTIONS}
15+
)

‎ports/boost-algorithm/vcpkg.json‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-algorithm",
44
"version": "1.84.0",
5+
"port-version": 1,
56
"description": "Boost algorithm module",
67
"homepage": "https://github.com/boostorg/algorithm",
78
"license": "BSL-1.0",
@@ -18,6 +19,10 @@
1819
"name": "boost-bind",
1920
"version>=": "1.84.0"
2021
},
22+
{
23+
"name": "boost-cmake",
24+
"version>=": "1.84.0"
25+
},
2126
{
2227
"name": "boost-concept-check",
2328
"version>=": "1.84.0"
@@ -38,6 +43,10 @@
3843
"name": "boost-function",
3944
"version>=": "1.84.0"
4045
},
46+
{
47+
"name": "boost-headers",
48+
"version>=": "1.84.0"
49+
},
4150
{
4251
"name": "boost-iterator",
4352
"version>=": "1.84.0"
@@ -73,10 +82,6 @@
7382
{
7483
"name": "boost-unordered",
7584
"version>=": "1.84.0"
76-
},
77-
{
78-
"name": "boost-vcpkg-helpers",
79-
"version>=": "1.84.0"
8085
}
8186
]
8287
}

‎ports/boost-align/portfile.cmake‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ vcpkg_from_github(
88
HEAD_REF master
99
)
1010

11-
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
12-
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
11+
set(FEATURE_OPTIONS "")
12+
boost_configure_and_install(
13+
SOURCE_PATH "${SOURCE_PATH}"
14+
OPTIONS ${FEATURE_OPTIONS}
15+
)

‎ports/boost-align/vcpkg.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-align",
44
"version": "1.84.0",
5+
"port-version": 1,
56
"description": "Boost align module",
67
"homepage": "https://github.com/boostorg/align",
78
"license": "BSL-1.0",
@@ -10,6 +11,10 @@
1011
"name": "boost-assert",
1112
"version>=": "1.84.0"
1213
},
14+
{
15+
"name": "boost-cmake",
16+
"version>=": "1.84.0"
17+
},
1318
{
1419
"name": "boost-config",
1520
"version>=": "1.84.0"
@@ -19,11 +24,11 @@
1924
"version>=": "1.84.0"
2025
},
2126
{
22-
"name": "boost-static-assert",
27+
"name": "boost-headers",
2328
"version>=": "1.84.0"
2429
},
2530
{
26-
"name": "boost-vcpkg-helpers",
31+
"name": "boost-static-assert",
2732
"version>=": "1.84.0"
2833
}
2934
]

‎ports/boost-any/portfile.cmake‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ vcpkg_from_github(
88
HEAD_REF master
99
)
1010

11-
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
12-
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
11+
set(FEATURE_OPTIONS "")
12+
boost_configure_and_install(
13+
SOURCE_PATH "${SOURCE_PATH}"
14+
OPTIONS ${FEATURE_OPTIONS}
15+
)

‎ports/boost-any/vcpkg.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-any",
44
"version": "1.84.0",
5+
"port-version": 1,
56
"description": "Boost any module",
67
"homepage": "https://github.com/boostorg/any",
78
"license": "BSL-1.0",
@@ -10,20 +11,24 @@
1011
"name": "boost-assert",
1112
"version>=": "1.84.0"
1213
},
14+
{
15+
"name": "boost-cmake",
16+
"version>=": "1.84.0"
17+
},
1318
{
1419
"name": "boost-config",
1520
"version>=": "1.84.0"
1621
},
1722
{
18-
"name": "boost-throw-exception",
23+
"name": "boost-headers",
1924
"version>=": "1.84.0"
2025
},
2126
{
22-
"name": "boost-type-index",
27+
"name": "boost-throw-exception",
2328
"version>=": "1.84.0"
2429
},
2530
{
26-
"name": "boost-vcpkg-helpers",
31+
"name": "boost-type-index",
2732
"version>=": "1.84.0"
2833
}
2934
]

‎ports/boost-array/portfile.cmake‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,8 @@ vcpkg_from_github(
88
HEAD_REF master
99
)
1010

11-
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
12-
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
11+
set(FEATURE_OPTIONS "")
12+
boost_configure_and_install(
13+
SOURCE_PATH "${SOURCE_PATH}"
14+
OPTIONS ${FEATURE_OPTIONS}
15+
)

‎ports/boost-array/vcpkg.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
33
"name": "boost-array",
44
"version": "1.84.0",
5+
"port-version": 1,
56
"description": "Boost array module",
67
"homepage": "https://github.com/boostorg/array",
78
"license": "BSL-1.0",
@@ -10,6 +11,10 @@
1011
"name": "boost-assert",
1112
"version>=": "1.84.0"
1213
},
14+
{
15+
"name": "boost-cmake",
16+
"version>=": "1.84.0"
17+
},
1318
{
1419
"name": "boost-config",
1520
"version>=": "1.84.0"
@@ -19,15 +24,15 @@
1924
"version>=": "1.84.0"
2025
},
2126
{
22-
"name": "boost-static-assert",
27+
"name": "boost-headers",
2328
"version>=": "1.84.0"
2429
},
2530
{
26-
"name": "boost-throw-exception",
31+
"name": "boost-static-assert",
2732
"version>=": "1.84.0"
2833
},
2934
{
30-
"name": "boost-vcpkg-helpers",
35+
"name": "boost-throw-exception",
3136
"version>=": "1.84.0"
3237
}
3338
]

0 commit comments

Comments
 (0)