Skip to content

Commit 0715397

Browse files
committed
Update build.jam, build/Jamfile, test/Jamfile
1 parent e639810 commit 0715397

File tree

3 files changed

+34
-30
lines changed

3 files changed

+34
-30
lines changed

build.jam

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
# Copyright René Ferdinand Rivera Morell 2023-2024
1+
# Copyright 2023-2024 René Ferdinand Rivera Morell
2+
# Copyright 2024 Peter Dimov
23
# Distributed under the Boost Software License, Version 1.0.
3-
# (See accompanying file LICENSE_1_0.txt or copy at
4-
# http://www.boost.org/LICENSE_1_0.txt)
4+
# https://www.boost.org/LICENSE_1_0.txt
55

66
require-b2 5.2 ;
77

88
constant boost_dependencies :
9-
/boost/config//boost_config ;
10-
11-
project /boost/timer
12-
: common-requirements
13-
<include>include
9+
/boost/config//boost_config
1410
;
1511

12+
project /boost/timer ;
13+
1614
explicit
1715
[ alias boost_timer : build//boost_timer ]
1816
[ alias all : boost_timer build test ]
@@ -21,4 +19,3 @@ explicit
2119
call-if : boost-library timer
2220
: install boost_timer
2321
;
24-

build/Jamfile.v2

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,28 @@
77

88
# See library home page at http://www.boost.org/libs/timer
99

10-
SOURCES = auto_timers_construction cpu_timer ;
11-
1210
constant boost_dependencies_private :
1311
/boost/io//boost_io
1412
/boost/predef//boost_predef
1513
;
1614

1715
project
18-
: common-requirements <library>$(boost_dependencies)
19-
: requirements <library>$(boost_dependencies_private) ;
20-
21-
lib boost_timer
22-
: ../src/$(SOURCES).cpp
23-
: # requirements
24-
<link>shared:<define>BOOST_TIMER_DYN_LINK=1
25-
<link>static:<define>BOOST_TIMER_STATIC_LINK=1
26-
: # default-build
27-
: # usage-requirements
28-
<link>shared:<define>BOOST_TIMER_DYN_LINK=1
29-
<link>static:<define>BOOST_TIMER_STATIC_LINK=1
30-
<define>BOOST_TIMER_NO_LIB=1
31-
;
16+
: common-requirements
17+
18+
<include>../include
19+
20+
<library>$(boost_dependencies)
21+
22+
<link>shared:<define>BOOST_TIMER_DYN_LINK=1
23+
<link>static:<define>BOOST_TIMER_STATIC_LINK=1
24+
25+
<define>BOOST_TIMER_NO_LIB=1
26+
27+
: requirements
28+
29+
<library>$(boost_dependencies_private)
30+
;
31+
32+
local SOURCES = auto_timers_construction cpu_timer ;
33+
34+
lib boost_timer : ../src/$(SOURCES).cpp ;

test/Jamfile.v2

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,26 @@ path-constant parent : .. ; # so that inspect will start in boost-root/libs/tim
1515
project
1616
: requirements
1717
<library>/boost/timer//boost_timer
18+
<library>/boost/core//boost_core
19+
<library>/boost/detail//boost_detail
1820
;
1921

20-
run ../example/auto_cpu_timer_example.cpp : : : <test-info>always_show_run_output ;
22+
run ../example/auto_cpu_timer_example.cpp
23+
: : : <test-info>always_show_run_output ;
2124

22-
run cpu_timer_info.cpp : : : <test-info>always_show_run_output <library>/boost/detail//boost_detail ;
25+
run cpu_timer_info.cpp
26+
: : : <test-info>always_show_run_output ;
2327

2428
run cpu_timer_test.cpp
25-
: : : <test-info>always_show_run_output <library>/boost/detail//boost_detail ;
29+
: : : <test-info>always_show_run_output ;
2630

2731
run ../example/timex.cpp : echo "Hello, world" : : <test-info>always_show_run_output ;
2832

2933
compile original_timer_test.cpp ;
3034

31-
run chrono_conflict_test.cpp /boost/chrono//boost_chrono : : : <link>static ;
35+
run chrono_conflict_test.cpp : : : <library>/boost/chrono//boost_chrono <link>static ;
3236

33-
run progress_display_test.cpp /boost/core//boost_core ;
37+
run progress_display_test.cpp ;
3438

3539
# run /boost/tools/inspect//inspect/<variant>release : $(parent) -text -brief : : <test-info>always_show_run_output : inspect ;
3640
# explicit inspect ;

0 commit comments

Comments
 (0)