Skip to content

Commit bd0a2d5

Browse files
committed
- Use of the module 'os' to get BOOST_DIR.
- Add macro SINGLE_THREADED to single threading mode. - Define single threading mode as default. - Add lambda_overload_test and hashable_test.
1 parent 561a09d commit bd0a2d5

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

Jamroot

+21-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33

44
import os ;
55

6-
local BOOST_DIR = "/usr/local" ;
6+
local boost_dir = [ os.environ BOOST_DIR ] ;
7+
if ! $(boost_dir)
8+
{
9+
boost_dir = "/usr/local" ;
10+
}
711

812
#using clang : : ;
913

@@ -16,19 +20,20 @@ if ! $(cxx_std)
1620
project mapbox_variant
1721
: requirements
1822
<cxxflags>-std=$(cxx_std)
19-
<include>$(BOOST_DIR)/include
23+
<include>$(boost_dir)/include
2024
<include>include
2125
<include>test/include
2226
<variant>release:<cxxflags>-march=native
27+
<threading>single:<define>SINGLE_THREADED
2328
: default-build
2429
<variant>release
2530
<optimization>speed
31+
<threading>single
2632
;
2733

2834
exe variant-test
2935
: test/bench_variant.cpp
30-
: #<define>SINGLE_THREADED
31-
<variant>release:<cxxflags>-Wweak-vtables
36+
: <variant>release:<cxxflags>-Wweak-vtables
3237
;
3338
explicit variant-test ;
3439

@@ -52,10 +57,21 @@ exe reference_wrapper_test
5257
;
5358
explicit reference_wrapper_test ;
5459

60+
exe lambda_overload_test
61+
: test/lambda_overload_test.cpp
62+
;
63+
explicit lambda_overload_test ;
64+
65+
exe hashable_test
66+
: test/hashable_test.cpp
67+
;
68+
explicit hashable_test ;
69+
5570
install out
5671
: variant-test
5772
binary-visitor-test
58-
recursive-wrapper-test
5973
unique-ptr-test
6074
reference_wrapper_test
75+
lambda_overload_test
76+
hashable_test
6177
;

0 commit comments

Comments
 (0)