Skip to content

Commit 3c3d4a5

Browse files
committed
Cleanup of qbs projects
1 parent 812de40 commit 3c3d4a5

11 files changed

Lines changed: 82 additions & 88 deletions

File tree

src/array19.lib/array19/array19.qbs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Product {
33
Depends { name: "cpp19" }
44

5+
Export {
6+
Depends { name: "cpp" }
7+
cpp.includePaths: [".."]
8+
Depends { name: "cpp19" }
9+
}
10+
511
files: [
612
"Array.h",
713
"Array.ostream.h",
@@ -19,10 +25,4 @@ Product {
1925
"Zip.h",
2026
"adlRange.h",
2127
]
22-
23-
Export {
24-
Depends { name: "cpp" }
25-
cpp.includePaths: [".."]
26-
Depends { name: "cpp19" }
27-
}
2828
}

src/enum19.lib/enum19/enum19.qbs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ Product {
44
Depends { name: "string19" }
55
Depends { name: "fmt"; required: false }
66

7+
Export {
8+
Depends { name: "cpp" }
9+
cpp.includePaths: [".."]
10+
Depends { name: "string19" }
11+
}
12+
713
files: [
814
"ADL.h",
915
"Enum.extras.ostream.h",
@@ -13,10 +19,4 @@ Product {
1319
"Enum.ostream.h",
1420
"visitEnumMemberNames.h",
1521
]
16-
17-
Export {
18-
Depends { name: "cpp" }
19-
cpp.includePaths: [".."]
20-
Depends { name: "string19" }
21-
}
2222
}

src/meta19.lib/meta19/meta19.qbs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Product {
33
Depends { name: "array19" }
44

5+
Export {
6+
Depends { name: "cpp" }
7+
cpp.includePaths: [".."]
8+
Depends { name: "array19" }
9+
}
10+
511
Group {
612
name: "Index"
713
files: [
@@ -47,16 +53,9 @@ Product {
4753
"TypePackTemplate.h",
4854
]
4955
}
50-
5156
files: [
5257
"Unreachable.h",
5358
"isSame.h",
5459
"nullptr_to.h",
5560
]
56-
57-
Export {
58-
Depends { name: "cpp" }
59-
cpp.includePaths: [".."]
60-
Depends { name: "array19" }
61-
}
6261
}

src/optional19.lib/optional19/optional19.qbs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ Product {
33
Depends { name: "cpp" }
44
Depends { name: "meta19" }
55

6+
Export {
7+
Depends { name: "cpp" }
8+
cpp.includePaths: [".."]
9+
Depends { name: "meta19" }
10+
}
11+
612
files: [
713
"Optional.equals.h",
814
"Optional.h",
@@ -12,10 +18,4 @@ Product {
1218
"PackedOptional.ostream.h",
1319
"PackedOptionalNan.h",
1420
]
15-
16-
Export {
17-
Depends { name: "cpp" }
18-
cpp.includePaths: [".."]
19-
Depends { name: "meta19" }
20-
}
2121
}

src/partial19.lib/partial19/partial19.qbs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
Product {
33
Depends { name: "meta19" }
44

5+
Export {
6+
Depends { name: "cpp" }
7+
cpp.includePaths: [".."]
8+
Depends { name: "meta19" }
9+
}
10+
511
files: [
612
"Bitset.h",
713
"Partial.equals.h",
814
"Partial.h",
915
"Partial.ostream.h",
1016
"align.h",
1117
]
12-
13-
Export {
14-
Depends { name: "cpp" }
15-
cpp.includePaths: [".."]
16-
Depends { name: "meta19" }
17-
}
1818
}

src/serialize19.lib/serialize19/serialize19.qbs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ Product {
33
Depends { name: "cpp" }
44
Depends { name: "meta19" }
55

6-
Depends { name: "variant19"; required: false }
7-
Depends { name: "strong19"; required: false }
86
Depends { name: "optional19"; required: false }
7+
Depends { name: "partial19"; required: false }
8+
Depends { name: "strong19"; required: false }
9+
Depends { name: "tuple19"; required: false }
10+
Depends { name: "variant19"; required: false }
911

10-
files: [
11-
"dynamicWrite.h",
12-
"serialize.h",
13-
]
12+
Export {
13+
Depends { name: "cpp" }
14+
cpp.includePaths: [".."]
15+
Depends { name: "meta19" }
16+
}
1417

1518
Group {
1619
name: "Archive"
@@ -33,7 +36,6 @@ Product {
3336
"WriteAppender.h",
3437
]
3538
}
36-
3739
Group {
3840
name: "serialize co-cpp19"
3941
files: [
@@ -62,10 +64,8 @@ Product {
6264
"serialize.std_vector.h",
6365
]
6466
}
65-
66-
Export {
67-
Depends { name: "cpp" }
68-
cpp.includePaths: [".."]
69-
Depends { name: "meta19" }
70-
}
67+
files: [
68+
"dynamicWrite.h",
69+
"serialize.h",
70+
]
7171
}

src/serialize19.lib/serialize19/serialize19.tests.qbs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ Application {
66
consoleApplication: true
77
type: ["application", "autotest"]
88

9+
Depends { name: "googletest" }
10+
Depends { name: "optional19" }
11+
Depends { name: "partial19" }
912
Depends { name: "serialize19" }
10-
Depends { name: "variant19" }
1113
Depends { name: "tuple19" }
12-
Depends { name: "partial19" }
13-
Depends { name: "optional19" }
14-
Depends { name: "googletest" }
14+
Depends { name: "variant19" }
1515

1616
Group {
1717
name: "std"
@@ -35,7 +35,6 @@ Application {
3535
"serialize.Variant.test.cpp",
3636
]
3737
}
38-
3938
files: [
4039
"Codec.test.cpp",
4140
"Endianness.test.cpp",

src/string19.lib/string19/string19.qbs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11

22
Product {
3-
Depends { name: "cpp" }
43
Depends { name: "tuple19" }
54
Depends { name: "fmt"; required: false }
65

7-
files: [
8-
"ADL.h",
9-
"DynamicString.h",
10-
]
6+
Export {
7+
Depends { name: "cpp" }
8+
cpp.includePaths: [".."]
9+
Depends { name: "tuple19" }
10+
}
11+
1112
Group {
1213
name: "Rope"
1314
files: [
@@ -42,10 +43,8 @@ Product {
4243
"StringView.store.h",
4344
]
4445
}
45-
46-
Export {
47-
Depends { name: "cpp" }
48-
cpp.includePaths: [".."]
49-
Depends { name: "tuple19" }
50-
}
46+
files: [
47+
"ADL.h",
48+
"DynamicString.h",
49+
]
5150
}
Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11

22
Product {
3-
Depends { name: "cpp" }
43
Depends { name: "string19" }
54
Depends { name: "fmt"; required: false }
65

7-
files: [
8-
"ADL.h",
9-
"Macro.h",
10-
"Strong.extras.ostream.h",
11-
"Strong.fmt.h",
12-
"Strong.h",
13-
"Strong.hash.h",
14-
"Strong.less.h",
15-
"Strong.ostream.h",
16-
"Strong.traits.h",
17-
"WeakOf.h",
18-
]
19-
206
Export {
217
Depends { name: "cpp" }
228
cpp.includePaths: [".."]
@@ -29,4 +15,17 @@ Product {
2915
)
3016
}
3117
}
18+
19+
files: [
20+
"ADL.h",
21+
"Macro.h",
22+
"Strong.extras.ostream.h",
23+
"Strong.fmt.h",
24+
"Strong.h",
25+
"Strong.hash.h",
26+
"Strong.less.h",
27+
"Strong.ostream.h",
28+
"Strong.traits.h",
29+
"WeakOf.h",
30+
]
3231
}
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11

22
Product {
3-
Depends { name: "cpp" }
43
Depends { name: "meta19" }
54

5+
Export {
6+
Depends { name: "cpp" }
7+
cpp.includePaths: [".."]
8+
Depends { name: "meta19" }
9+
}
10+
611
files: [
712
"Tuple.bind.h",
813
"Tuple.h",
914
"Tuple.ostream.h",
1015
"Tuple.trait.h",
1116
]
12-
13-
Export {
14-
Depends { name: "cpp" }
15-
cpp.includePaths: [".."]
16-
Depends { name: "meta19" }
17-
}
1817
}

0 commit comments

Comments
 (0)