Skip to content

Commit f356685

Browse files
authored
Merge pull request #183 from grafikrobot/modular
Add support for modular build structure.
2 parents a8229dd + 4514459 commit f356685

File tree

3 files changed

+38
-11
lines changed

3 files changed

+38
-11
lines changed

build.jam

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Copyright René Ferdinand Rivera Morell 2023-2024
2+
# 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)
5+
6+
require-b2 5.2 ;
7+
8+
import feature ;
9+
10+
feature.feature boost.nowide.lfs : auto no : optional propagated ;
11+
12+
constant boost_dependencies :
13+
/boost/config//boost_config
14+
;
15+
16+
project /boost/nowide
17+
: common-requirements
18+
<include>include
19+
;
20+
21+
explicit
22+
[ alias boost_nowide : build//boost_nowide ]
23+
[ alias all : boost_nowide test ]
24+
;
25+
26+
call-if : boost-library nowide
27+
: install boost_nowide
28+
;
29+

build/Jamfile.v2

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# Copyright (c) 2002, 2006 Beman Dawes
22
# Copyright (c) 2012 Artyom Beilis (Tonkikh)
33
# Copyright (c) 2020-2021 Alexander Grund
4-
#
4+
#
55
# Distributed under the Boost Software License, Version 1.0.
66
# https://www.boost.org/LICENSE_1_0.txt
77
#
88
# See library home page at https://www.boost.org/libs/nowide
99

10-
import ../../config/checks/config : requires ;
10+
import-search /boost/config/checks ;
11+
import config : requires ;
1112
import configure ;
12-
import feature ;
13-
14-
feature.feature boost.nowide.lfs : auto no : optional propagated ;
1513

1614
local requirements =
1715
<link>shared:<define>BOOST_NOWIDE_DYN_LINK=1
16+
<define>BOOST_NOWIDE_NO_LIB=1
1817
;
1918

20-
project boost/nowide
19+
project
2120
: source-location ../src
21+
: common-requirements <library>$(boost_dependencies)
2222
: requirements $(requirements)
2323
[ requires
2424
cxx11_auto_declarations
@@ -46,5 +46,3 @@ lib boost_nowide
4646
: $(SOURCES).cpp
4747
: <include>../src
4848
;
49-
50-
boost-install boost_nowide ;

test/Jamfile.v2

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2003, 2006 Beman Dawes
22
# Copyright (c) 2012 Artyom Beilis (Tonkikh)
33
# Copyright (c) 2020-2022 Alexander Grund
4-
#
4+
#
55
# Distributed under the Boost Software License, Version 1.0.
66
# https://www.boost.org/LICENSE_1_0.txt
77

@@ -23,11 +23,11 @@ project : requirements
2323
<include>.
2424
<warnings>pedantic
2525
<warnings-as-errors>on
26-
[ check-target-builds ../config//cxx11_moveable_fstreams "std::fstream is moveable and swappable" : : <build>no ]
26+
[ check-target-builds ../config//cxx11_moveable_fstreams "std::fstream is moveable and swappable" : : <build>no ]
2727
;
2828

2929
lib shell32 ;
30-
lib file_test_helpers : file_test_helpers.cpp : <link>static -<library>/boost/nowide//boost_nowide ;
30+
lib file_test_helpers : file_test_helpers.cpp : <link>static -<library>/boost/nowide//boost_nowide <use>/boost/nowide//boost_nowide ;
3131
explicit file_test_helpers ;
3232

3333
run test_codecvt.cpp ;

0 commit comments

Comments
 (0)