diff --git a/ports/boost-stacktrace/features.cmake b/ports/boost-stacktrace/features.cmake index 3491066c40..3147a326df 100644 --- a/ports/boost-stacktrace/features.cmake +++ b/ports/boost-stacktrace/features.cmake @@ -22,16 +22,10 @@ # When ON, builds the boost_stacktrace_windbg_cached library variant. Defaults to ON under Windows when WinDbg support is autodetected and when thread_local is supported, otherwise OFF. -list(APPEND FEATURE_OPTIONS - -DBOOST_STACKTRACE_ENABLE_BACKTRACE=OFF - ) - -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND FEATURE_OPTIONS - -DBOOST_STACKTRACE_ENABLE_WINDBG=ON - ) -else() - list(APPEND FEATURE_OPTIONS - -DBOOST_STACKTRACE_ENABLE_WINDBG=OFF - ) -endif() \ No newline at end of file +vcpkg_check_features( + OUT_FEATURE_OPTIONS + FEATURE_OPTIONS + FEATURES + "backtrace" BOOST_STACKTRACE_ENABLE_BACKTRACE + "windbg" BOOST_STACKTRACE_ENABLE_WINDBG +) diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index e734e99177..480e1d89fc 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -2,7 +2,7 @@ "$comment": "Automatically generated by scripts/boost/generate-ports.ps1", "name": "boost-stacktrace", "version": "1.85.0", - "port-version": 2, + "port-version": 3, "description": "Boost stacktrace module", "homepage": "https://www.boost.org/libs/stacktrace", "license": "BSL-1.0", @@ -40,5 +40,31 @@ "name": "boost-winapi", "version>=": "1.85.0" } - ] + ], + "default-features": [ + { + "name": "backtrace", + "platform": "!windows" + }, + { + "name": "windbg", + "platform": "windows" + } + ], + "features": { + "backtrace": { + "description": "Use boost_stacktrace_backtrace", + "supports": "!windows", + "dependencies": [ + { + "name": "libbacktrace", + "platform": "!windows" + } + ] + }, + "windbg": { + "description": "Use boost_stacktrace_windbg", + "supports": "windows" + } + } } diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index c70a13f9b7..88006050c9 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -147,7 +147,21 @@ $portData = @{ } } } - "boost-stacktrace" = @{ "supports" = "!uwp" }; + "boost-stacktrace" = @{ + "default-features" = @(@{ "name" = "backtrace"; "platform" = "!windows" }; @{ "name" = "windbg"; "platform" = "windows" }); + "supports" = "!uwp"; + "features" = @{ + "backtrace" = @{ + "description" = "Use boost_stacktrace_backtrace"; + "supports" = "!windows"; + "dependencies" = @(@{ "name" = "libbacktrace"; "platform" = "!windows" }); + }; + "windbg" = @{ + "description" = "Use boost_stacktrace_windbg"; + "supports" = "windows"; + }; + } + }; "boost-test" = @{ "supports" = "!uwp" }; "boost-wave" = @{ "supports" = "!uwp" }; } diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index d2b91e3d51..8d2483298d 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a81aa3960c8e5eb5c5d3dbc77ba97b830c89667c", + "version": "1.85.0", + "port-version": 3 + }, { "git-tree": "0c354b5302458460959a9dd1ef3e80b813e8513a", "version": "1.85.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7e4c5e8da9..5bac4e1892 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1222,7 +1222,7 @@ }, "boost-stacktrace": { "baseline": "1.85.0", - "port-version": 2 + "port-version": 3 }, "boost-statechart": { "baseline": "1.85.0",