Simplifying templates

Author: sean-parent

README.md

@@ -73,7 +73,6 @@ cpp_library_setup(
     [TESTS test_list]              # Test source files to build (e.g., "tests.cpp")  
     [DOCS_EXCLUDE_SYMBOLS symbols] # Symbols to exclude from docs
     [REQUIRES_CPP_VERSION 17|20|23] # C++ version (default: 17)
-    [FORCE_INIT]                  # Force regeneration of template files
 )
 ```
 
@@ -84,6 +83,23 @@ automatically detected from git tags.
 **NOTE**: Examples using doctest should have `test` in the name if you want them to be visible in
 the TestMate test explorer.
 
+### Template Regeneration
+
+To force regeneration of template files (CMakePresets.json, CI workflows, etc.), you can use the `init` preset:
+
+```bash
+cmake --preset=init
+cmake --build --preset=init
+```
+
+Alternatively, you can set the CMake variable `CPP_LIBRARY_FORCE_INIT` to `ON`:
+
+```bash
+cmake -DCPP_LIBRARY_FORCE_INIT=ON .
+```
+
+This will regenerate all template files, overwriting any existing ones.
+
 ### Path Conventions
 
 The template uses consistent path conventions for all file specifications:
@@ -170,7 +186,7 @@ cpp_library_setup(
   - `test`: Debug build with testing
   - `docs`: Documentation generation
   - `clang-tidy`: Static analysis
-  - `init`: Template regeneration
+  - `init`: Template regeneration (forces regeneration of CMakePresets.json, CI workflows, etc.)
 
 ### CI/CD Features
 
@@ -254,6 +270,12 @@ cpp_library_setup(
    ctest --preset=test
    ```
 
+7. **Regenerate templates** (if needed):
+   ```bash
+   cmake --preset=init
+   cmake --build --preset=init
+   ```
+
 ## Template Files Generated
 
 The template automatically generates:

cmake/cpp-library-ci.cmake

@@ -141,6 +141,8 @@ function(_cpp_library_copy_templates)
         ".gitattributes"
         ".vscode/extensions.json"
         "docs/index.html"
+        "CMakePresets.json"
+        ".github/workflows/ci.yml"
     )
 
     foreach(template_file IN LISTS TEMPLATE_FILES)

cmake/cpp-library-presets.cmake

@@ -15,8 +15,6 @@ include(CTest)
 include("${CPP_LIBRARY_ROOT}/cmake/cpp-library-setup.cmake")
 include("${CPP_LIBRARY_ROOT}/cmake/cpp-library-testing.cmake")  
 include("${CPP_LIBRARY_ROOT}/cmake/cpp-library-docs.cmake")
-include("${CPP_LIBRARY_ROOT}/cmake/cpp-library-presets.cmake")
-include("${CPP_LIBRARY_ROOT}/cmake/cpp-library-ci.cmake")
 
 # Shared function to handle examples and tests consistently
 function(_cpp_library_setup_executables)
@@ -101,9 +99,6 @@ endfunction()
 # Main entry point function - users call this to set up their library
 function(cpp_library_setup)
     # Parse arguments
-    set(options 
-        FORCE_INIT             # Force regeneration of template files
-    )
     set(oneValueArgs
         DESCRIPTION             # Description string
         NAMESPACE               # Namespace (e.g., "stlab")
@@ -117,10 +112,8 @@ function(cpp_library_setup)
         DOCS_EXCLUDE_SYMBOLS    # Symbols to exclude from docs
     )
 
-    cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
+    cmake_parse_arguments(ARG "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-    
     # Validate required arguments
     if(NOT ARG_DESCRIPTION)
         message(FATAL_ERROR "cpp_library_setup: DESCRIPTION is required")
@@ -143,15 +136,6 @@ function(cpp_library_setup)
         set(ARG_REQUIRES_CPP_VERSION 17)
     endif()
 
-    # Set default for FORCE_INIT (can be overridden via -DCPP_LIBRARY_FORCE_INIT=ON)
-    if(NOT DEFINED ARG_FORCE_INIT)
-        set(ARG_FORCE_INIT FALSE)
-    endif()
-    
-    if(DEFINED CPP_LIBRARY_FORCE_INIT AND CPP_LIBRARY_FORCE_INIT)
-        set(ARG_FORCE_INIT TRUE)
-    endif()
-    
     # Get version from git tags
     _cpp_library_get_git_version(GIT_VERSION)
     set(ARG_VERSION "${GIT_VERSION}")
@@ -212,15 +196,8 @@ function(cpp_library_setup)
         )
     endif()
 
-    # Generate CMakePresets.json
-    if(ARG_FORCE_INIT)
-        _cpp_library_generate_presets(FORCE_INIT)
-    else()
-        _cpp_library_generate_presets()
-    endif()
-
-    # Copy static template files (like .clang-format, .gitignore, etc.)
-    if(ARG_FORCE_INIT)
+    # Copy static template files (like .clang-format, .gitignore, CMakePresets.json, etc.)
+    if(DEFINED CPP_LIBRARY_FORCE_INIT AND CPP_LIBRARY_FORCE_INIT)
         _cpp_library_copy_templates(FORCE_INIT)
     else()
         _cpp_library_copy_templates()
@@ -246,21 +223,7 @@ function(cpp_library_setup)
         )
     endif()
 
-    # Setup CI
-    if(ARG_FORCE_INIT)
-        _cpp_library_setup_ci(
-            NAME "${ARG_NAME}"
-            VERSION "${ARG_VERSION}"
-            DESCRIPTION "${ARG_DESCRIPTION}"
-            FORCE_INIT
-        )
-    else()
-        _cpp_library_setup_ci(
-            NAME "${ARG_NAME}"
-            VERSION "${ARG_VERSION}"
-            DESCRIPTION "${ARG_DESCRIPTION}"
-        )
-    endif()
+
 
     # Build examples if specified (only when BUILD_TESTING is enabled)
     if(BUILD_TESTING AND ARG_EXAMPLES)

cmake/cpp-library-setup.cmake

@@ -1,3 +1,6 @@
+# Auto-generated from cpp-library (https://github.com/stlab/cpp-library)
+# Do not edit this file directly - it will be overwritten when templates are regenerated
+
 # Format style options described here:
 #     https://clang.llvm.org/docs/ClangFormatStyleOptions.html
 
@@ -49,7 +52,7 @@ BreakConstructorInitializers: AfterColon
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: false
 ColumnLimit: 100
-CommentPragmas: '^ IWYU pragma:'
+CommentPragmas: "^ IWYU pragma:"
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
@@ -59,28 +62,28 @@ DerivePointerAlignment: false
 DisableFormat: false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
-ForEachMacros:   
+ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
-IncludeBlocks:   Preserve
-IncludeCategories: 
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-  - Regex:           '.*'
-    Priority:        1
-IncludeIsMainRegex: '$'
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority: 2
+  - Regex: '^(<|"(gtest|gmock|isl|json)/)'
+    Priority: 3
+  - Regex: ".*"
+    Priority: 1
+IncludeIsMainRegex: "$"
 IndentCaseLabels: true
 IndentPPDirectives: None # Other option is AfterHash, which indents top level includes as well
 IndentWidth: 4
 IndentWrappedFunctionNames: true
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: ''
-MacroBlockEnd: ''
+MacroBlockBegin: ""
+MacroBlockEnd: ""
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 ObjCBlockIndentWidth: 4
@@ -116,4 +119,3 @@ Language: Cpp
 ---
 Language: ObjC
 PointerAlignment: Right
-...

cpp-library.cmake

@@ -1,2 +1,5 @@
+# Auto-generated from cpp-library (https://github.com/stlab/cpp-library)
+# Do not edit this file directly - it will be overwritten when templates are regenerated
+
 # Auto detect text files and perform LF normalization
 * text=auto

templates/.clang-format

@@ -1,3 +1,6 @@
+# Auto-generated from cpp-library (https://github.com/stlab/cpp-library)
+# Do not edit this file directly - it will be overwritten when templates are regenerated
+
 name: CI
 
 on:

templates/.gitattributes

@@ -1,3 +1,6 @@
+# Auto-generated from cpp-library (https://github.com/stlab/cpp-library)
+# Do not edit this file directly - it will be overwritten when templates are regenerated
+
 /.cpm-cache
 /.cache
 /build

templates/.github/workflows/ci.yml.in renamed to templates/.github/workflows/ci.yml

@@ -1,4 +1,5 @@
 {
+    "_comment": "Auto-generated from cpp-library (https://github.com/stlab/cpp-library) - Do not edit this file directly",
     "recommendations": [
         "matepek.vscode-catch2-test-adapter",
         "llvm-vs-code-extensions.vscode-clangd",