Add PACKAGE_NAME to install setup and improve version detection

The _cpp_library_setup_install function now requires a PACKAGE_NAME argument, ensuring correct package naming in generated CMake config files and install locations. Version detection in _cpp_library_get_git_version now prefers PROJECT_VERSION if set, improving compatibility with package managers and source archives.

Author: sean-parent

cmake/cpp-library-install.cmake

@@ -13,14 +13,15 @@ include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
 # Configures CMake install rules for library target and package config files.
-# - Precondition: NAME, VERSION, and NAMESPACE specified; target NAME exists
+# - Precondition: NAME, PACKAGE_NAME, VERSION, and NAMESPACE specified; target NAME exists
 # - Postcondition: install rules created for target, config files, and export with NAMESPACE:: prefix
 # - Supports header-only (INTERFACE) and compiled libraries, uses SameMajorVersion compatibility
 function(_cpp_library_setup_install)
     set(oneValueArgs
-        NAME        # Target name (e.g., "stlab-enum-ops")
-        VERSION     # Version string (e.g., "1.2.3")
-        NAMESPACE   # Namespace for alias (e.g., "stlab")
+        NAME            # Target name (e.g., "stlab-enum-ops")
+        PACKAGE_NAME    # Package name for find_package() (e.g., "enum-ops")
+        VERSION         # Version string (e.g., "1.2.3")
+        NAMESPACE       # Namespace for alias (e.g., "stlab")
     )
     set(multiValueArgs
         HEADERS     # List of header file paths (for FILE_SET support check)
@@ -32,6 +33,9 @@ function(_cpp_library_setup_install)
     if(NOT ARG_NAME)
         message(FATAL_ERROR "_cpp_library_setup_install: NAME is required")
     endif()
+    if(NOT ARG_PACKAGE_NAME)
+        message(FATAL_ERROR "_cpp_library_setup_install: PACKAGE_NAME is required")
+    endif()
     if(NOT ARG_VERSION)
         message(FATAL_ERROR "_cpp_library_setup_install: VERSION is required")
     endif()
@@ -64,32 +68,32 @@ function(_cpp_library_setup_install)
     # Generate package version file
     # Uses SameMajorVersion compatibility (e.g., 2.1.0 is compatible with 2.0.0)
     write_basic_package_version_file(
-        "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}ConfigVersion.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/${ARG_PACKAGE_NAME}ConfigVersion.cmake"
         VERSION ${ARG_VERSION}
         COMPATIBILITY SameMajorVersion
     )
 
     # Generate package config file from template
     configure_file(
         "${CPP_LIBRARY_ROOT}/templates/Config.cmake.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}Config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/${ARG_PACKAGE_NAME}Config.cmake"
         @ONLY
     )
 
     # Install export targets with namespace
     # This allows downstream projects to use find_package(package-name)
     # and link against namespace::target
     install(EXPORT ${ARG_NAME}Targets
-        FILE ${ARG_NAME}Targets.cmake
+        FILE ${ARG_PACKAGE_NAME}Targets.cmake
         NAMESPACE ${ARG_NAMESPACE}::
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${ARG_NAME}
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${ARG_PACKAGE_NAME}
     )
 
     # Install package config and version files
     install(FILES
-        "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}Config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}ConfigVersion.cmake"
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${ARG_NAME}
+        "${CMAKE_CURRENT_BINARY_DIR}/${ARG_PACKAGE_NAME}Config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/${ARG_PACKAGE_NAME}ConfigVersion.cmake"
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${ARG_PACKAGE_NAME}
     )
 
 endfunction()

cmake/cpp-library-setup.cmake

@@ -2,9 +2,16 @@
 #
 # cpp-library-setup.cmake - Core library setup functionality
 
-# Returns version string from latest git tag, falling back to "0.0.0".
-# - Postcondition: OUTPUT_VAR set to version string with 'v' prefix removed
+# Returns version string from PROJECT_VERSION (if set), git tag (with 'v' prefix removed), or 
+#    "0.0.0" fallback
 function(_cpp_library_get_git_version OUTPUT_VAR)
+    # If PROJECT_VERSION is already set (e.g., by vcpkg or other package manager),
+    # use it instead of trying to query git (which may not be available in source archives)
+    if(DEFINED PROJECT_VERSION AND NOT PROJECT_VERSION STREQUAL "")
+        set(${OUTPUT_VAR} "${PROJECT_VERSION}" PARENT_SCOPE)
+        return()
+    endif()
+    
     # Try to get version from git tags
     execute_process(
         COMMAND git describe --tags --abbrev=0
@@ -96,6 +103,7 @@ function(_cpp_library_setup_core)
     if(ARG_TOP_LEVEL)
         _cpp_library_setup_install(
             NAME "${ARG_NAME}"
+            PACKAGE_NAME "${CLEAN_NAME}"
             VERSION "${ARG_VERSION}"
             NAMESPACE "${ARG_NAMESPACE}"
             HEADERS "${ARG_HEADERS}"