From 5093142e5a5165ffd199545fd1ebe3bec1169393 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Wed, 1 May 2024 12:27:40 -0400 Subject: [PATCH 1/2] refactor: move input file for single include Signed-off-by: Henry Schreiner --- scripts/MakeSingleHeader.py | 2 +- CLI11.hpp.in => single-include/CLI11.hpp.in | 0 single-include/CMakeLists.txt | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename CLI11.hpp.in => single-include/CLI11.hpp.in (100%) diff --git a/scripts/MakeSingleHeader.py b/scripts/MakeSingleHeader.py index 7cca6f70a..d9cd7c545 100755 --- a/scripts/MakeSingleHeader.py +++ b/scripts/MakeSingleHeader.py @@ -137,7 +137,7 @@ def make_header(output, main_header, files, tag, namespace, macro=None, version= parser.add_argument("--output", default=None, help="Single header file output") parser.add_argument( "--main", - default="CLI11.hpp.in", + default="single-include/CLI11.hpp.in", help="The main include file that defines the other files", ) parser.add_argument("files", nargs="+", help="The header files") diff --git a/CLI11.hpp.in b/single-include/CLI11.hpp.in similarity index 100% rename from CLI11.hpp.in rename to single-include/CLI11.hpp.in diff --git a/single-include/CMakeLists.txt b/single-include/CMakeLists.txt index b21003e75..88ec22716 100644 --- a/single-include/CMakeLists.txt +++ b/single-include/CMakeLists.txt @@ -17,9 +17,9 @@ if(CLI11_SINGLE_FILE) OUTPUT "${PROJECT_BINARY_DIR}/single-include/CLI11.hpp" COMMAND Python::Interpreter "${PROJECT_SOURCE_DIR}/scripts/MakeSingleHeader.py" ${CLI11_headers} - ${CLI11_impl_headers} --main "${PROJECT_SOURCE_DIR}/CLI11.hpp.in" --output + ${CLI11_impl_headers} --main "${CMAKE_CURRENT_SOURCE_DIR}/CLI11.hpp.in" --output "${PROJECT_BINARY_DIR}/single-include/CLI11.hpp" --version "${CLI11_VERSION}" - DEPENDS "${PROJECT_SOURCE_DIR}/include/CLI/CLI.hpp" ${CLI11_headers} ${CLI11_impl_headers}) + DEPENDS "${PROJECT_SOURCE_DIR}/include/CLI/CLI.hpp" CLI11.hpp.in ${CLI11_headers} ${CLI11_impl_headers}) add_custom_target(CLI11-generate-single-file ALL DEPENDS "${PROJECT_BINARY_DIR}/single-include/CLI11.hpp") set_property(TARGET CLI11-generate-single-file PROPERTY FOLDER "Scripts") From 980d6f413103f20fe522cd54909555dc78f8ca9c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 16:45:05 +0000 Subject: [PATCH 2/2] style: pre-commit.ci fixes --- single-include/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/single-include/CMakeLists.txt b/single-include/CMakeLists.txt index 88ec22716..f11032f90 100644 --- a/single-include/CMakeLists.txt +++ b/single-include/CMakeLists.txt @@ -19,7 +19,8 @@ if(CLI11_SINGLE_FILE) Python::Interpreter "${PROJECT_SOURCE_DIR}/scripts/MakeSingleHeader.py" ${CLI11_headers} ${CLI11_impl_headers} --main "${CMAKE_CURRENT_SOURCE_DIR}/CLI11.hpp.in" --output "${PROJECT_BINARY_DIR}/single-include/CLI11.hpp" --version "${CLI11_VERSION}" - DEPENDS "${PROJECT_SOURCE_DIR}/include/CLI/CLI.hpp" CLI11.hpp.in ${CLI11_headers} ${CLI11_impl_headers}) + DEPENDS "${PROJECT_SOURCE_DIR}/include/CLI/CLI.hpp" CLI11.hpp.in ${CLI11_headers} + ${CLI11_impl_headers}) add_custom_target(CLI11-generate-single-file ALL DEPENDS "${PROJECT_BINARY_DIR}/single-include/CLI11.hpp") set_property(TARGET CLI11-generate-single-file PROPERTY FOLDER "Scripts")