Skip to content

Commit 6c62160

Browse files
committed
Revert "feat(ftxui): compile 7.0.3's own module units — import ftxui; works"
This reverts commit dd44f8e.
1 parent dd44f8e commit 6c62160

2 files changed

Lines changed: 3 additions & 33 deletions

File tree

pkgs/c/compat.ftxui.lua

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
-- component,util}), so the 6.1.9 globs apply verbatim, and the public header
1111
-- API this index's smoke test uses (hbox/text/separator, `Dimension::Fit`,
1212
-- `Screen::Create(Dimensions, Dimensions)`, `Render`) is source-compatible
13-
-- with 6.1.9. Upstream added C++20 module units (src/ftxui/*.cppm) and this
14-
-- descriptor compiles them, so 7.0.3 consumers can `import ftxui;` — the
15-
-- units are global-fragment includes + `using` re-exports, every declaration
16-
-- stays attached to the global module, and `#include`/`import` can be mixed
17-
-- in one consumer against the same compiled objects.
13+
-- with 6.1.9. Upstream added C++20 module units (src/ftxui/*.cppm,
14+
-- FTXUI_BUILD_MODULES, off by default); the `*.cpp` globs never match them,
15+
-- and the plain .cpp sources still compile header-only style.
1816
--
1917
-- ONE version skew the globs cannot express (no per-version build blocks,
2018
-- mcpp-community/mcpp#290): FTXUI 7 moved Loop's method definitions from
@@ -98,15 +96,6 @@ package = {
9896
"*/src/ftxui/**/*.cpp",
9997
"!*/src/ftxui/**/*_test.cpp", -- gtest files (30+ in 6.1.9, 47 in 7.0.3)
10098
"!*/src/ftxui/**/*_fuzzer.cpp", -- fuzz targets (16 in 6.1.9, 6 in 7.0.3)
101-
-- 7.0.3's own module units: global-fragment includes + `using`
102-
-- re-exports, so `import ftxui;` works and still links against
103-
-- the compiled .cpp objects. 6.1.9 has no .cppm — these globs
104-
-- are zero-hit warnings there, same as the redis-plus-plus union.
105-
"*/src/ftxui/screen.cppm",
106-
"*/src/ftxui/dom.cppm",
107-
"*/src/ftxui/component.cppm",
108-
"*/src/ftxui/util.cppm",
109-
"*/src/ftxui/ftxui.cppm",
11099
},
111100
targets = { ["ftxui"] = { kind = "lib" } },
112101
deps = { },

tests/examples/core/tests/module.cpp

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)