Skip to content

Commit ca1e13c

Browse files
authored
Merge branch 'develop' into feature/stacktrace-dump-library
2 parents fb044fa + d1e329d commit ca1e13c

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

build/Jamfile.v2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ lib dl ;
2929
lib gcc_s ;
3030
lib Dbgeng ;
3131
lib ole32 ;
32+
lib ucrt ;
3233

3334
local LIBBACKTRACE_PATH = [ modules.peek : LIBBACKTRACE_PATH ] ;
3435
lib backtrace
@@ -285,6 +286,7 @@ lib boost_stacktrace_from_exception
285286
<warnings>all
286287
<target-os>linux:<library>dl
287288
<library>boost_stacktrace_dump
289+
<target-os>windows:<library>ucrt
288290

289291
# Enable build when explicitly requested, or by default, when on x86
290292
<conditional>@build-stacktrace-from-exception

test/cmake_subdir_test/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ winapi
2525

2626
describe
2727
mp11
28-
static_assert
2928
throw_exception
3029
optional
3130
type_traits

0 commit comments

Comments
 (0)