Skip to content

Commit 386d98d

Browse files
phlptpphlptp
authored
Merge branch 'main' into cpp26_codecvt
2 parents e43ff02 + 10ac3e5 commit 386d98d

File tree

102 files changed

+302
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+302
-130
lines changed

‎.github/workflows/tests.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ jobs:
2828

2929
- name: Get LCov
3030
run: |
31-
wget https://github.com/linux-test-project/lcov/releases/download/v1.16/lcov-1.16.tar.gz
32-
tar -xzf lcov-1.16.tar.gz
33-
cd lcov-1.16
34-
sudo make install
31+
sudo apt-get install ca-certificates lcov
32+
#wget https://github.com/linux-test-project/lcov/releases/download/v1.16/lcov-1.16.tar.gz
33+
#tar -xzf lcov-1.16.tar.gz
34+
#cd lcov-1.16
35+
#sudo make install
3536
3637
- name: Configure
3738
run: |
@@ -50,8 +51,8 @@ jobs:
5051

5152
- name: Prepare coverage
5253
run: |
53-
lcov --directory . --capture --output-file coverage.info
54-
lcov --remove coverage.info '*/tests/*' '*/examples/*' '/usr/*' '*/book/*' '*/fuzz/*' --output-file coverage.info
54+
lcov --ignore-errors gcov,mismatch --directory . --capture --output-file coverage.info
55+
lcov --remove coverage.info '*/tests/*' '/usr/*' --output-file coverage.info
5556
lcov --list coverage.info
5657
working-directory: build
5758

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ repos:
2626
- id: debug-statements
2727

2828
- repo: https://github.com/pre-commit/mirrors-clang-format
29-
rev: v19.1.5
29+
rev: v19.1.6
3030
hooks:
3131
- id: clang-format
3232
types_or: [c++, c, cuda]

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CLI11 2.2 Copyright (c) 2017-2024 University of Cincinnati, developed by Henry
1+
CLI11 2.2 Copyright (c) 2017-2025 University of Cincinnati, developed by Henry
22
Schreiner under NSF AWARD 1414736. All rights reserved.
33

44
Redistribution and use in source and binary forms of CLI11, with or without

‎book/chapters/config.md

+20

‎cmake/CodeCoverage.cmake

+20-3
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@ function(setup_target_for_coverage_lcov)
270270
${Coverage_LCOV_ARGS}
271271
--gcov-tool
272272
${GCOV_PATH}
273+
--ignore-errors
274+
mismatch
273275
-directory
274276
.
275277
-b
@@ -281,6 +283,8 @@ function(setup_target_for_coverage_lcov)
281283
${Coverage_LCOV_ARGS}
282284
--gcov-tool
283285
${GCOV_PATH}
286+
--ignore-errors
287+
mismatch
284288
-c
285289
-i
286290
-d
@@ -302,6 +306,8 @@ function(setup_target_for_coverage_lcov)
302306
-b
303307
${BASEDIR}
304308
--capture
309+
--ignore-errors
310+
mismatch,gcov
305311
--output-file
306312
${Coverage_NAME}.capture)
307313
# add baseline counters
@@ -314,6 +320,8 @@ function(setup_target_for_coverage_lcov)
314320
${Coverage_NAME}.base
315321
-a
316322
${Coverage_NAME}.capture
323+
--ignore-errors
324+
mismatch,gcov
317325
--output-file
318326
${Coverage_NAME}.total)
319327
# filter collected data to final coverage report
@@ -322,14 +330,23 @@ function(setup_target_for_coverage_lcov)
322330
${Coverage_LCOV_ARGS}
323331
--gcov-tool
324332
${GCOV_PATH}
333+
--ignore-errors
334+
mismatch,mismatch,gcov
325335
--remove
326336
${Coverage_NAME}.total
327337
${LCOV_EXCLUDES}
328338
--output-file
329339
${Coverage_NAME}.info)
330340
# Generate HTML output
331-
set(LCOV_GEN_HTML_CMD ${GENHTML_PATH} ${GENHTML_EXTRA_ARGS} ${Coverage_GENHTML_ARGS} -o
332-
${Coverage_NAME} ${Coverage_NAME}.info)
341+
set(LCOV_GEN_HTML_CMD
342+
${GENHTML_PATH}
343+
${GENHTML_EXTRA_ARGS}
344+
--ignore-errors
345+
mismatch,mismatch
346+
${Coverage_GENHTML_ARGS}
347+
-o
348+
${Coverage_NAME}
349+
${Coverage_NAME}.info)
333350
if(${Coverage_SONARQUBE})
334351
# Generate SonarQube output
335352
set(GCOVR_XML_CMD
@@ -347,7 +364,7 @@ function(setup_target_for_coverage_lcov)
347364
COMMENT "SonarQube code coverage info report saved in ${Coverage_NAME}_sonarqube.xml.")
348365
endif()
349366

350-
if(CODE_COVERAGE_VERBOSE)
367+
if(CODE_COVERAGE_VERBOSE OR 1)
351368
message(STATUS "Executed command report")
352369
message(STATUS "Command to clean up lcov: ")
353370
string(REPLACE ";" " " LCOV_CLEAN_CMD_SPACED "${LCOV_CLEAN_CMD}")

‎examples/arg_capture.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/callback_passthrough.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/config_app.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/custom_parse.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/digit_args.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/enum.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/enum_ostream.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/formatter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/groups.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/help_usage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/inter_argument_order.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/json.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2021, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/modhelp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/nested.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/option_groups.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/positional_arity.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/positional_validation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/prefix_command.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/ranges.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/retired.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/shapes.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/simple.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/subcom_help.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/subcom_in_files/subcommand_a.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/subcom_in_files/subcommand_a.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/subcom_in_files/subcommand_main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/subcom_partitioned.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/subcommands.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/testEXE.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎examples/validators.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎fuzz/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
# Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
# under NSF AWARD 1414736 and by the respective contributors.
33
# All rights reserved.
44
#

‎fuzz/cli11_app_fuzz.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎fuzz/cli11_file_fuzz.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎fuzz/fuzzApp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎fuzz/fuzzApp.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎fuzz/fuzzCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎include/CLI/App.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎include/CLI/Argv.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎include/CLI/CLI.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎include/CLI/Config.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎include/CLI/ConfigFwd.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎include/CLI/Encoding.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

‎include/CLI/Error.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2017-2024, University of Cincinnati, developed by Henry Schreiner
1+
// Copyright (c) 2017-2025, University of Cincinnati, developed by Henry Schreiner
22
// under NSF AWARD 1414736 and by the respective contributors.
33
// All rights reserved.
44
//

0 commit comments

Comments
 (0)