Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[boost-cobalt] Throw error in the configure step when the compiler is not supported #42738

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
+26 −3
Draft

[boost-cobalt] Throw error in the configure step when the compiler is not supported #42738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
777ab6c
[boost-cobalt] Throw error in the configure step when the compiler is…
Dec 16, 2024
ba7e85b
bump version
Dec 16, 2024
6e1bea0
directly error out in CMakeLists
Dec 16, 2024
9f92912
version update
Dec 16, 2024
bd06358
format
JackBoosY Dec 18, 2024
f009cbb
version
JackBoosY Dec 18, 2024
21c63ad
bump boost-cobalt port version
JackBoosY Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/boost-cobalt/fail-on-compiler-not-supported.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a51d5285c..8374f911a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ project(boost_cobalt VERSION "${BOOST_COBALT_VERSION}" LANGUAGES CXX)

include(cmake/CheckRequirements.cmake)
if (NOT BOOST_COBALT_REQUIREMENTS_MATCHED)
- return()
+ message(FATAL_ERROR "The current compiler is not supported.")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break users who vcpkg install boost with a compiler without these features. I think the boost port should drop the dependency on boost-cobalt

endif()

set(BOOST_COBALT_IS_ROOT OFF)
5 changes: 4 additions & 1 deletion ports/boost-cobalt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# Automatically generated by scripts/boost/generate-ports.ps1
# Automatically generated by scripts/boost/generate-ports.ps1

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/cobalt
REF boost-${VERSION}
SHA512 a92ff4050772b61035121f944d81d4a9d6d2da858dedc0956ad850132657c80c660a8839a99597443751744577dd5b0958239e99d948d3036c85b8361151aa27
HEAD_REF master
PATCHES
fail-on-compiler-not-supported.patch

)

set(FEATURE_OPTIONS "")
Expand Down
1 change: 1 addition & 0 deletions ports/boost-cobalt/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-cobalt",
"version": "1.86.0",
"port-version": 1,
"description": "Boost cobalt module",
"homepage": "https://www.boost.org/libs/cobalt",
"license": "BSL-1.0",
Expand Down
3 changes: 2 additions & 1 deletion scripts/boost/generate-ports.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1")
# Clear this array when moving to a new boost version
$defaultPortVersion = 0
$portVersions = @{
'boost-build' = 1
'boost-build' = 1;
'boost-cobalt' = 1
}

function Get-PortVersion {
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/boost-cobalt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3195a6c18219720b8c98b5d449ff39b95535122e",
"version": "1.86.0",
"port-version": 1
},
{
"git-tree": "d45758e6c62b46ef436df6cffe7803dfc3ba8f10",
"version": "1.86.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@
},
"boost-cobalt": {
"baseline": "1.86.0",
"port-version": 0
"port-version": 1
},
"boost-compat": {
"baseline": "1.86.0",
Expand Down