Refactor to use PACKAGE_NAME for target and CI consistency

Replaces usage of a 'clean' name with PACKAGE_NAME for library target aliases and CI workflow templates. Ensures consistent naming between CMake targets and package discovery, improving clarity and reducing potential mismatches.

Author: sean-parent

cmake/cpp-library-setup.cmake

@@ -33,14 +33,15 @@ function(_cpp_library_get_git_version OUTPUT_VAR)
 endfunction()
 
 # Creates library target (INTERFACE or compiled) with headers and proper configuration.
-# - Precondition: NAME, NAMESPACE, and REQUIRES_CPP_VERSION specified
-# - Postcondition: library target created with alias NAMESPACE::CLEAN_NAME, install configured if TOP_LEVEL
+# - Precondition: NAME, NAMESPACE, PACKAGE_NAME, and REQUIRES_CPP_VERSION specified
+# - Postcondition: library target created with alias NAMESPACE::PACKAGE_NAME, install configured if TOP_LEVEL
 function(_cpp_library_setup_core)
     set(oneValueArgs
         NAME
         VERSION
         DESCRIPTION
         NAMESPACE
+        PACKAGE_NAME
         REQUIRES_CPP_VERSION
         TOP_LEVEL
     )
@@ -60,13 +61,10 @@ function(_cpp_library_setup_core)
     # Note: Project declaration is now handled in the main cpp_library_setup function
     # No need to check ARG_TOP_LEVEL here for project declaration
 
-    # Extract the library name without namespace prefix for target naming
-    string(REPLACE "${ARG_NAMESPACE}-" "" CLEAN_NAME "${ARG_NAME}")
-
     if(ARG_SOURCES)
         # Create a library with sources (respects BUILD_SHARED_LIBS variable)
         add_library(${ARG_NAME} ${ARG_SOURCES})
-        add_library(${ARG_NAMESPACE}::${CLEAN_NAME} ALIAS ${ARG_NAME})
+        add_library(${ARG_NAMESPACE}::${ARG_PACKAGE_NAME} ALIAS ${ARG_NAME})
         target_include_directories(${ARG_NAME} PUBLIC
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
             $<INSTALL_INTERFACE:include>
@@ -83,7 +81,7 @@ function(_cpp_library_setup_core)
     else()
         # Header-only INTERFACE target
         add_library(${ARG_NAME} INTERFACE)
-        add_library(${ARG_NAMESPACE}::${CLEAN_NAME} ALIAS ${ARG_NAME})
+        add_library(${ARG_NAMESPACE}::${ARG_PACKAGE_NAME} ALIAS ${ARG_NAME})
         target_include_directories(${ARG_NAME} INTERFACE
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
             $<INSTALL_INTERFACE:include>
@@ -103,7 +101,7 @@ function(_cpp_library_setup_core)
     if(ARG_TOP_LEVEL)
         _cpp_library_setup_install(
             NAME "${ARG_NAME}"
-            PACKAGE_NAME "${CLEAN_NAME}"
+            PACKAGE_NAME "${ARG_PACKAGE_NAME}"
             VERSION "${ARG_VERSION}"
             NAMESPACE "${ARG_NAMESPACE}"
             HEADERS "${ARG_HEADERS}"

cpp-library.cmake

@@ -140,6 +140,9 @@ function(cpp_library_setup)
     endif()
     set(ARG_NAME "${PROJECT_NAME}")
 
+    # Calculate PACKAGE_NAME (clean name without namespace prefix) for template substitution
+    string(REPLACE "${ARG_NAMESPACE}-" "" PACKAGE_NAME "${ARG_NAME}")
+    
     # Set defaults
     if(NOT ARG_REQUIRES_CPP_VERSION)
         set(ARG_REQUIRES_CPP_VERSION 17)
@@ -184,6 +187,7 @@ function(cpp_library_setup)
         VERSION "${ARG_VERSION}" 
         DESCRIPTION "${ARG_DESCRIPTION}"
         NAMESPACE "${ARG_NAMESPACE}"
+        PACKAGE_NAME "${PACKAGE_NAME}"
         HEADERS "${GENERATED_HEADERS}"
         SOURCES "${GENERATED_SOURCES}"
         REQUIRES_CPP_VERSION "${ARG_REQUIRES_CPP_VERSION}"

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

@@ -83,9 +83,9 @@ jobs:
           cmake_minimum_required(VERSION 3.20)
           project(test-find-package CXX)
 
-          find_package(@PROJECT_NAME@ REQUIRED)
+          find_package(@PACKAGE_NAME@ REQUIRED)
 
-          message(STATUS "Successfully found @PROJECT_NAME@")
+          message(STATUS "Successfully found @PACKAGE_NAME@")
           EOF
 
           # Convert paths to forward slashes for CMake (works on all platforms)