Simplifying by removing customization options.

Author: sean-parent

README.md

@@ -33,7 +33,7 @@ set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cpm-cache CACHE PATH "CPM cache")
 include(cmake/CPM.cmake)
 
 # Fetch cpp-library via CPM
-CPMAddPackage("gh:stlab/cpp-library@1.0.0")
+CPMAddPackage("gh:stlab/cpp-library@3.0.0")
 include(${cpp-library_SOURCE_DIR}/cpp-library.cmake)
 
 cpp_library_setup(
@@ -63,33 +63,21 @@ cpp_library_setup(
     # Required parameters
     DESCRIPTION description        # e.g., "Type-safe operators for enums"
     NAMESPACE namespace            # e.g., "stlab"
-    
-    # Optional parameters
-    VERSION version_string         # e.g., "1.0.0" (auto-detected from git tags if not provided)
-    
-    # Header specification (one required)
     HEADERS header_list            # List of header files
-    HEADER_DIR directory           # Directory to install recursively
-
+    
     # Optional: source specification for non-header-only libraries
-    SOURCES source_list            # List of source files (e.g., src/*.cpp)
+    SOURCES source_list            # List of source files (auto-detected from src/ if not provided)
 
     # Optional features
     [EXAMPLES example_list]        # Example executables to build
     [TESTS test_list]              # Test executables to build  
     [DOCS_EXCLUDE_SYMBOLS symbols] # Symbols to exclude from docs
     [REQUIRES_CPP_VERSION 17|20|23] # C++ version (default: 17)
-    [ADDITIONAL_DEPS dep_list]     # Extra CPM dependencies
-
-    # Optional flags
-    [CUSTOM_INSTALL]              # Skip default installation
-    [NO_PRESETS]                  # Skip CMakePresets.json generation
-    [NO_CI]                       # Skip CI generation (enabled by default)
     [FORCE_INIT]                  # Force regeneration of template files
 )
 ```
 
-**Note**: The project name is automatically taken from `PROJECT_NAME` (set by the `project()` command). You must call `project(your-library)` before `cpp_library_setup()`.
+**Note**: The project name is automatically taken from `PROJECT_NAME` (set by the `project()` command). You must call `project(your-library)` before `cpp_library_setup()`. Version is automatically detected from git tags.
 
 ## Features
 ### Non-Header-Only Library Support
@@ -115,6 +103,7 @@ cpp_library_setup(
 - **Build isolation** with separate build directories
 - **Two-mode operation**: Full infrastructure when top-level, lightweight when consumed
 - **Automatic version detection**: Version is automatically extracted from git tags (e.g., `v1.2.3` becomes `1.2.3`)
+- **Always-enabled features**: CI/CD, CMakePresets.json, and proper installation are always generated
 
 ### Testing Features
 
@@ -161,7 +150,6 @@ cpp_library_setup(
 
 - **Automatic git tag detection**: Version is automatically extracted from the latest git tag
 - **Fallback versioning**: Uses `0.0.0` if no git tag is found (with warning)
-- **Manual override**: You can still specify `VERSION` parameter to override automatic detection
 - **Tag format support**: Supports both `v1.2.3` and `1.2.3` tag formats
 
 ## Example Projects
@@ -175,21 +163,18 @@ This template is used by:
 
 ```cmake
 cmake_minimum_required(VERSION 3.20)
+project(enum-ops)
 
 # Setup cpp-library infrastructure
 set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cpm-cache CACHE PATH "CPM cache" FORCE)
 include(cmake/CPM.cmake)
 
 # Fetch cpp-library via CPM (using local path for development)
-CPMAddPackage(
-    URI gh:stlab/[email protected]
-    DOWNLOAD_ONLY YES
-)
+CPMAddPackage("gh:stlab/[email protected]")
 include(${cpp-library_SOURCE_DIR}/cpp-library.cmake)
 
 # Configure library (handles both lightweight and full modes automatically)
 cpp_library_setup(
-    NAME stlab-enum-ops
     DESCRIPTION "Type-safe operators for enums"
     NAMESPACE stlab
     HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/stlab/enum_ops.hpp

cmake/cpp-library-setup.cmake

@@ -30,7 +30,6 @@ function(_cpp_library_setup_core)
         VERSION 
         DESCRIPTION
         NAMESPACE
-        HEADER_DIR
         REQUIRES_CPP_VERSION
         TOP_LEVEL
     )
@@ -100,14 +99,6 @@ function(_cpp_library_setup_core)
             FILE_SET headers DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
         )
 
-        # Install header directory if specified (fallback for older CMake)
-        if(ARG_HEADER_DIR)
-            install(DIRECTORY ${ARG_HEADER_DIR}/
-                DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-                FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
-            )
-        endif()
-        
         # Generate package config files
         write_basic_package_version_file(
             "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}ConfigVersion.cmake"

cpp-library.cmake

@@ -22,25 +22,19 @@ include("${CPP_LIBRARY_ROOT}/cmake/cpp-library-ci.cmake")
 function(cpp_library_setup)
     # Parse arguments
     set(options 
-        CUSTOM_INSTALL          # Skip default installation
-        NO_PRESETS             # Skip CMakePresets.json generation
-        NO_CI                  # Skip CI generation (CI enabled by default)
         FORCE_INIT             # Force regeneration of template files
     )
     set(oneValueArgs
-        VERSION                 # Version string (e.g., "1.0.0") 
         DESCRIPTION             # Description string
         NAMESPACE               # Namespace (e.g., "stlab")
         REQUIRES_CPP_VERSION    # C++ version (default: 17)
-        HEADER_DIR              # Directory to install recursively
     )
     set(multiValueArgs
         HEADERS                 # List of header files
         SOURCES                 # List of source files (optional, for non-header-only)
         EXAMPLES                # Example executables to build
         TESTS                   # Test executables to build  
         DOCS_EXCLUDE_SYMBOLS    # Symbols to exclude from docs
-        ADDITIONAL_DEPS         # Extra CPM dependencies
     )
 
     cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -60,8 +54,8 @@ function(cpp_library_setup)
     if(NOT ARG_NAMESPACE)
         message(FATAL_ERROR "cpp_library_setup: NAMESPACE is required")
     endif()
-    if(NOT ARG_HEADERS AND NOT ARG_HEADER_DIR)
-        message(FATAL_ERROR "cpp_library_setup: Either HEADERS or HEADER_DIR is required")
+    if(NOT ARG_HEADERS)
+        message(FATAL_ERROR "cpp_library_setup: HEADERS is required")
     endif()
 
     # Use PROJECT_NAME as the library name
@@ -83,13 +77,11 @@ function(cpp_library_setup)
         set(ARG_FORCE_INIT TRUE)
     endif()
 
-    # Get version from git tags if not provided
-    if(NOT ARG_VERSION)
-        _cpp_library_get_git_version(GIT_VERSION)
-        set(ARG_VERSION "${GIT_VERSION}")
-    endif()
+    # Get version from git tags
+    _cpp_library_get_git_version(GIT_VERSION)
+    set(ARG_VERSION "${GIT_VERSION}")
 
-    # Parse version components for manual setting
+    # Parse version components
     string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" VERSION_MATCH "${ARG_VERSION}")
     if(VERSION_MATCH)
         set(ARG_VERSION_MAJOR ${CMAKE_MATCH_1})
@@ -101,13 +93,11 @@ function(cpp_library_setup)
         set(ARG_VERSION_PATCH 0)
     endif()
 
-    # Update project version if it was detected from git
-    if(NOT DEFINED PROJECT_VERSION OR PROJECT_VERSION STREQUAL "")
-        set(PROJECT_VERSION ${ARG_VERSION} PARENT_SCOPE)
-        set(PROJECT_VERSION_MAJOR ${ARG_VERSION_MAJOR} PARENT_SCOPE)
-        set(PROJECT_VERSION_MINOR ${ARG_VERSION_MINOR} PARENT_SCOPE)
-        set(PROJECT_VERSION_PATCH ${ARG_VERSION_PATCH} PARENT_SCOPE)
-    endif()
+    # Update project version
+    set(PROJECT_VERSION ${ARG_VERSION} PARENT_SCOPE)
+    set(PROJECT_VERSION_MAJOR ${ARG_VERSION_MAJOR} PARENT_SCOPE)
+    set(PROJECT_VERSION_MINOR ${ARG_VERSION_MINOR} PARENT_SCOPE)
+    set(PROJECT_VERSION_PATCH ${ARG_VERSION_PATCH} PARENT_SCOPE)
 
     # Create the basic library target (always done)
     _cpp_library_setup_core(
@@ -117,7 +107,6 @@ function(cpp_library_setup)
         NAMESPACE "${ARG_NAMESPACE}"
         HEADERS "${ARG_HEADERS}"
         SOURCES "${ARG_SOURCES}"
-        HEADER_DIR "${ARG_HEADER_DIR}"
         REQUIRES_CPP_VERSION "${ARG_REQUIRES_CPP_VERSION}"
         TOP_LEVEL "${PROJECT_IS_TOP_LEVEL}"
     )
@@ -137,10 +126,8 @@ function(cpp_library_setup)
         )
     endif()
 
-    # Generate CMakePresets.json (unless disabled)
-    if(NOT ARG_NO_PRESETS)
-        _cpp_library_generate_presets(FORCE_INIT ${ARG_FORCE_INIT})
-    endif()
+    # Generate CMakePresets.json
+    _cpp_library_generate_presets(FORCE_INIT ${ARG_FORCE_INIT})
 
     # Copy static template files (like .clang-format, .gitignore, etc.)
     _cpp_library_copy_templates(FORCE_INIT ${ARG_FORCE_INIT})
@@ -164,15 +151,13 @@ function(cpp_library_setup)
         )
     endif()
 
-    # Setup CI (unless disabled)
-    if(NOT ARG_NO_CI)
-        _cpp_library_setup_ci(
-            NAME "${ARG_NAME}"
-            VERSION "${ARG_VERSION}"
-            DESCRIPTION "${ARG_DESCRIPTION}"
-            FORCE_INIT ${ARG_FORCE_INIT}
-        )
-    endif()
+    # Setup CI
+    _cpp_library_setup_ci(
+        NAME "${ARG_NAME}"
+        VERSION "${ARG_VERSION}"
+        DESCRIPTION "${ARG_DESCRIPTION}"
+        FORCE_INIT ${ARG_FORCE_INIT}
+    )
 
     # Build examples if specified  
     if(ARG_EXAMPLES)