Skip to content

Commit 86024bf

Browse files
committed
CLI11 is pulled dynamically.
1 parent ddd1565 commit 86024bf

4 files changed

Lines changed: 52 additions & 15 deletions

File tree

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,3 @@
2828
[submodule "dep/nlohmann_json"]
2929
path = dep/nlohmann_json
3030
url = https://github.com/nlohmann/json
31-
[submodule "dep/cli11"]
32-
path = dep/cli11
33-
url = https://github.com/CLIUtils/CLI11

dep/build.py

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,3 +222,54 @@
222222
)
223223
],
224224
)
225+
226+
package(
227+
name="cli11_lib",
228+
package="CLI11",
229+
fallback=cxxlibrary(
230+
name="cli11_fallback_lib",
231+
srcs=[],
232+
hdrs={
233+
h: f"dep/cli11/include/{h}"
234+
for h in [
235+
"CLI/Error.hpp",
236+
"CLI/App.hpp",
237+
"CLI/ExtraValidators.hpp",
238+
"CLI/ConfigFwd.hpp",
239+
"CLI/impl",
240+
"CLI/impl/Encoding_inl.hpp",
241+
"CLI/impl/Config_inl.hpp",
242+
"CLI/impl/Split_inl.hpp",
243+
"CLI/impl/Validators_inl.hpp",
244+
"CLI/impl/ExtraValidators_inl.hpp",
245+
"CLI/impl/App_inl.hpp",
246+
"CLI/impl/Option_inl.hpp",
247+
"CLI/impl/Formatter_inl.hpp",
248+
"CLI/impl/StringTools_inl.hpp",
249+
"CLI/impl/Argv_inl.hpp",
250+
"CLI/Split.hpp",
251+
"CLI/Version.hpp",
252+
"CLI/Config.hpp",
253+
"CLI/StringTools.hpp",
254+
"CLI/TypeTools.hpp",
255+
"CLI/FormatterFwd.hpp",
256+
"CLI/CLI.hpp",
257+
"CLI/Macros.hpp",
258+
"CLI/Formatter.hpp",
259+
"CLI/Option.hpp",
260+
"CLI/Argv.hpp",
261+
"CLI/Encoding.hpp",
262+
"CLI/Validators.hpp",
263+
"CLI/Timer.hpp",
264+
]
265+
},
266+
deps=[
267+
git_repository(
268+
name="cli11_repo",
269+
url="https://github.com/CLIUtils/CLI11",
270+
branch="v2.6.1",
271+
path="dep/cli11",
272+
)
273+
],
274+
),
275+
)

dep/cli11

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/gui2/build.py

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,6 @@ def sources_from(path, except_for=[]):
5454
),
5555
)
5656

57-
package(
58-
name="cli11_lib",
59-
package="CLI11",
60-
fallback=cxxlibrary(
61-
name="cli11_fallback_lib",
62-
srcs=[],
63-
hdrs=headers_from("dep/cli11/include"),
64-
),
65-
)
66-
6757
if config.osx:
6858
clibrary(
6959
name="libnfd",
@@ -235,7 +225,7 @@ def sources_from(path, except_for=[]):
235225
".+libthrowingptr",
236226
".+libwolv",
237227
"+fmt_lib",
238-
".+cli11_lib",
228+
"dep+cli11_lib",
239229
".+nlohmannjson_lib",
240230
],
241231
)

0 commit comments

Comments
 (0)