Refactor CMake dependency provider setup and enhance argument parsing

- Moved the installation of the dependency provider to occur after all function definitions, ensuring proper setup.
- Improved argument parsing in _cpp_library_add_dependency to handle package names and version numbers more robustly, including regex escaping for special characters.
- Added a new test to verify handling of version numbers with regex metacharacters, ensuring accurate dependency generation.

These changes enhance the reliability and clarity of the CMake configuration for the cpp-library.

Author: sean-parent

cmake/cpp-library-dependency-provider.cmake

@@ -35,17 +35,8 @@ get_property(_CPP_LIBRARY_PROVIDER_INSTALLED GLOBAL PROPERTY _CPP_LIBRARY_PROVID
 if(_CPP_LIBRARY_PROVIDER_INSTALLED)
     return()
 endif()
-set_property(GLOBAL PROPERTY _CPP_LIBRARY_PROVIDER_INSTALLED TRUE)
-
-# Install the dependency provider
-cmake_language(SET_DEPENDENCY_PROVIDER _cpp_library_dependency_provider
-    SUPPORTED_METHODS 
-        FIND_PACKAGE
-        FETCHCONTENT_MAKEAVAILABLE_SERIAL
-)
-
-message(STATUS "cpp-library: Dependency tracking enabled")
 
+# Define all functions BEFORE installing the provider
 # The dependency provider implementation
 # This function is called before every find_package() and FetchContent_MakeAvailable()
 function(_cpp_library_dependency_provider method)
@@ -172,3 +163,14 @@ function(_cpp_library_get_all_tracked_deps OUTPUT_VAR)
     set(${OUTPUT_VAR} "${ALL_DEPS}" PARENT_SCOPE)
 endfunction()
 
+# Now install the dependency provider (after all functions are defined)
+set_property(GLOBAL PROPERTY _CPP_LIBRARY_PROVIDER_INSTALLED TRUE)
+
+cmake_language(SET_DEPENDENCY_PROVIDER _cpp_library_dependency_provider
+    SUPPORTED_METHODS 
+        FIND_PACKAGE
+        FETCHCONTENT_MAKEAVAILABLE_SERIAL
+)
+
+message(STATUS "cpp-library: Dependency tracking enabled")
+

cmake/cpp-library-install.cmake

@@ -175,13 +175,32 @@ endfunction()
 function(_cpp_library_add_dependency FIND_DEP_ARGS)
     # Parse: PackageName [Version] [COMPONENTS component1 component2 ...] [other args]
     string(REGEX MATCH "^([^ ]+)" PKG_NAME "${FIND_DEP_ARGS}")
-    string(REGEX REPLACE "^${PKG_NAME} ?" "" REMAINING_ARGS "${FIND_DEP_ARGS}")
+    
+    # Remove package name from args - use string(REPLACE) for literal match
+    string(LENGTH "${PKG_NAME}" PKG_NAME_LEN)
+    string(LENGTH "${FIND_DEP_ARGS}" TOTAL_LEN)
+    if(TOTAL_LEN GREATER PKG_NAME_LEN)
+        math(EXPR START_POS "${PKG_NAME_LEN}")
+        string(SUBSTRING "${FIND_DEP_ARGS}" ${START_POS} -1 REMAINING_ARGS)
+        string(STRIP "${REMAINING_ARGS}" REMAINING_ARGS)
+    else()
+        set(REMAINING_ARGS "")
+    endif()
 
     # Extract version (first token that looks like a version number)
     set(VERSION "")
     if(REMAINING_ARGS MATCHES "^([0-9][0-9.]*)")
         set(VERSION "${CMAKE_MATCH_1}")
-        string(REGEX REPLACE "^${VERSION} ?" "" REMAINING_ARGS "${REMAINING_ARGS}")
+        # Remove version from args - use substring to avoid regex issues with dots
+        string(LENGTH "${VERSION}" VERSION_LEN)
+        string(LENGTH "${REMAINING_ARGS}" TOTAL_LEN)
+        if(TOTAL_LEN GREATER VERSION_LEN)
+            math(EXPR START_POS "${VERSION_LEN}")
+            string(SUBSTRING "${REMAINING_ARGS}" ${START_POS} -1 REMAINING_ARGS)
+            string(STRIP "${REMAINING_ARGS}" REMAINING_ARGS)
+        else()
+            set(REMAINING_ARGS "")
+        endif()
     endif()
 
     # Extract COMPONENTS if present
@@ -192,7 +211,13 @@ function(_cpp_library_add_dependency FIND_DEP_ARGS)
         # Extract just the component names (until next keyword or end)
         string(REGEX REPLACE " +(REQUIRED|OPTIONAL_COMPONENTS|CONFIG|NO_MODULE).*$" "" COMPONENTS "${COMPONENTS_PART}")
         # Remove COMPONENTS and component names from base args
-        string(REGEX REPLACE "COMPONENTS +${COMPONENTS}" "" BASE_ARGS "${REMAINING_ARGS}")
+        # Escape COMPONENTS for safe regex use (syntax: string(REGEX ESCAPE <out-var> <string>))
+        string(REPLACE "." "\\." COMPONENTS_ESCAPED "${COMPONENTS}")
+        string(REPLACE "*" "\\*" COMPONENTS_ESCAPED "${COMPONENTS_ESCAPED}")
+        string(REPLACE "+" "\\+" COMPONENTS_ESCAPED "${COMPONENTS_ESCAPED}")
+        string(REPLACE "[" "\\[" COMPONENTS_ESCAPED "${COMPONENTS_ESCAPED}")
+        string(REPLACE "]" "\\]" COMPONENTS_ESCAPED "${COMPONENTS_ESCAPED}")
+        string(REGEX REPLACE "COMPONENTS +${COMPONENTS_ESCAPED}" "" BASE_ARGS "${REMAINING_ARGS}")
         string(STRIP "${COMPONENTS}" COMPONENTS)
     endif()
     string(STRIP "${BASE_ARGS}" BASE_ARGS)

tests/install/test_dependency_provider.cmake

@@ -98,3 +98,12 @@ mock_target_links(test26_target "MyPackage::MyPackage")
 _cpp_library_generate_dependencies(RESULT test26_target "mylib")
 verify_output("${RESULT}" "find_dependency(MyPackage 2.0.0 CONFIG)" "Test 26")
 
+# Test 27: Regex metacharacters in version numbers (bug fix verification)
+run_test("Version with dots - regex escaping")
+set_property(GLOBAL PROPERTY "_CPP_LIBRARY_TRACKED_DEP_OpenCV" "OpenCV 4.5.3 COMPONENTS core imgproc")
+set_property(GLOBAL APPEND PROPERTY _CPP_LIBRARY_ALL_TRACKED_DEPS "OpenCV")
+set_property(GLOBAL PROPERTY _CPP_LIBRARY_PROVIDER_INSTALLED TRUE)
+mock_target_links(test27_target "OpenCV::core" "OpenCV::imgproc")
+_cpp_library_generate_dependencies(RESULT test27_target "mylib")
+verify_output("${RESULT}" "find_dependency(OpenCV 4.5.3 COMPONENTS core imgproc)" "Test 27")
+