Skip to content

Commit 043e27a

Browse files
committed
comments: no rules-qt-xim or mcpp-deps left in the members and fixtures
1 parent 72c3d10 commit 043e27a

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

‎rules/qt.cppm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ inline bool compile(options opt = {}) {
443443
"{}: module(s){} not found in {}. The base package carries Core, Gui, Widgets, "
444444
"Network, Svg, Qml, Quick and the other qtbase/qtdeclarative modules; the "
445445
"additional libraries (Multimedia, Charts, WebSockets, ...) are `xim:qt-addons`, "
446-
"which the `rules-qt-xim-addons` feature declares.",
446+
"which the project declares beside `xim:qt`.",
447447
who, list, generic(main)));
448448
}
449449

‎tests/all-rules-compile/build.mcpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ int main() {
8181
auto apkPlan = mcpp::dist::apk::plan_for();
8282
ok = ok && !apkPlan.applies;
8383

84-
// `rules-qt` without `rules-qt-xim` has no SDK here, so the question that
85-
// plans nothing is where the SDK would be: nowhere.
84+
// `rules-qt` declares no SDK and this fixture declares none, so the
85+
// question that plans nothing is where the SDK would be: nowhere.
8686
ok = ok && mcpp::rules::qt::roots({ .root = "no-such-qt-sdk" }).empty();
8787
// The `deps-*` members install through an action; asked only what they
8888
// derive without one -- the triplet this target defaults to, and the file

‎tests/vcpkg-consumer/build.mcpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ import mcpp.deps.vcpkg;
77
int main() {
88
mcpp::deps::vcpkg::options o;
99
o.libraries = { "fmt" };
10-
// This fixture lives inside the package it depends on by path, and mcpp keys
11-
// that package's host tool by a stamp of its tree, `target/` excepted
12-
// (mcpp#705). An installation beside the manifest would change the stamp,
13-
// rebuild `mcpp-deps` and run again, so it goes under `target/`. A project
14-
// that takes `mcpp:plugins` from the index keeps vcpkg's default.
10+
// This fixture lives inside the package it depends on by path, so its
11+
// installation goes under `target/`, which `git clean` and the CI's
12+
// `rm -rf target` reset with the rest of the fixture. A project keeps
13+
// vcpkg's default.
1514
o.install_root = "target/vcpkg_installed";
1615
// A file the program would read at run time, placed beside it.
1716
o.deploy = {{"share/fmt/copyright", "licenses/fmt"}};

0 commit comments

Comments
 (0)