CPS: Remove experimental gate (mostly)

Remove basic CPS import and export from 'experimental' status. Update
documentation and tests accordingly.

Note that mapped exports (CMAKE_EXPERIMENTAL_MAPPED_PACKAGE_INFO) are
still experimental.

Auxiliary/vim/syntax/cmake.vim

@@ -3539,7 +3539,6 @@ syn keyword cmakeKWexport contained
             \ APPENDIX
             \ AUTO
             \ CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_DEPENDENCIES
-            \ CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
             \ CMAKE_MAP_IMPORTED_CONFIG_
             \ COMPAT_VERSION
             \ CONFIG
@@ -3835,7 +3834,6 @@ syn keyword cmakeKWfind_package contained
             \ BYPASS_PROVIDER
             \ CATEGORY
             \ CMAKE_DISABLE_FIND_PACKAGE_
-            \ CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES
             \ CMAKE_FIND_ROOT_PATH_BOTH
             \ CMAKE_FIND_USE_
             \ CMAKE_REQUIRE_FIND_PACKAGE_
@@ -4149,7 +4147,6 @@ syn keyword cmakeKWinstall contained
             \ BUILD_TYPE
             \ BUNDLE_EXECUTABLE
             \ CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_DEPENDENCIES
-            \ CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
             \ CMAKE_INSTALL_BINDIR
             \ CMAKE_INSTALL_DATADIR
             \ CMAKE_INSTALL_DATAROOTDIR
@@ -4417,7 +4414,6 @@ syn keyword cmakeKWproject contained
             \ ASM_MASM
             \ ASM_NASM
             \ ATT
-            \ CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
             \ CMAKE_PROJECT_
             \ COMPAT_VERSION
             \ CPS

Help/command/export.rst

@@ -153,9 +153,6 @@ Exporting Targets to the |CPS|
          [CXX_MODULES_DIRECTORY <directory>])
 
 .. versionadded:: 4.3
-.. note::
-
-  Experimental. Gated by ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO``.
 
 Creates a file in the |CPS|_ that may be included by outside projects to import
 targets named by ``<target>...`` from the current project's build tree.  See

Help/command/find_package.rst

@@ -75,23 +75,25 @@ The command has a few modes by which it searches for packages:
 .. _`Config mode`:
 
 **Config mode**
-  In this mode, CMake searches for a file called
-  ``<lowercasePackageName>-config.cmake`` or ``<PackageName>Config.cmake``.
-  It will also look for ``<lowercasePackageName>-config-version.cmake`` or
+  In this mode, CMake searches for a file matching any of:
+
+  * ``<lowercasePackageName>-config.cmake``
+  * ``<PackageName>Config.cmake``
+  * ``<PackageName>.cps``
+  * ``<lowercasePackageName>.cps``
+
+  If one of the first two is found, CMake will also look respectively, for
+  ``<lowercasePackageName>-config-version.cmake`` or
   ``<PackageName>ConfigVersion.cmake`` if version details were specified
   (see :ref:`version selection` for an explanation of how these separate
-  version files are used).
+  version files are used).  The first two options are CMake-script package
+  descriptions.  The latter two are |CPS|_ (CPS) package descriptions, which
+  are more portable and include version information in the 'base' file.  Aside
+  from any explicitly noted exceptions, any references to "config files",
+  "config mode", "package configuration files", and so forth refer equally to
+  both CPS and CMake-script files.
 
   .. note::
-    If the experimental ``CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES`` is enabled,
-    files named ``<PackageName>.cps`` and ``<lowercasePackageName>.cps`` are
-    also considered.  These files provide package information according to the
-    |CPS|_ (CPS), which is more portable than CMake script.  Aside from any
-    explicitly noted exceptions, any references to "config files", "config
-    mode", "package configuration files", and so forth refer equally to both
-    CPS and CMake-script files.  This functionality is a work in progress, and
-    some features may be missing.
-
     Search is implemented in a manner that will tend to prefer |CPS| files
     over CMake-script config files in most cases.  Specifying ``CONFIGS``
     suppresses consideration of CPS files.
@@ -312,8 +314,14 @@ the names following it are used instead of ``<PackageName>``.  The names are
 also considered when determining whether to redirect the call to a package
 provided by :module:`FetchContent`.
 
-The command searches for a file called ``<PackageName>Config.cmake`` or
-``<lowercasePackageName>-config.cmake`` for each name specified.
+The command searches for a file whose name, for each package name specified,
+matches any of:
+
+* ``<PackageName>Config.cmake``
+* ``<lowercasePackageName>-config.cmake``
+* ``<PackageName>.cps``
+* ``<lowercasePackageName>.cps``
+
 A replacement set of possible configuration file names may be given
 using the ``CONFIGS`` option.  The :ref:`search procedure` is specified below.
 Once found, any :ref:`version constraint <version selection>` is checked,
@@ -324,9 +332,8 @@ is stored in the CMake variable ``<PackageName>_CONFIG``.
 
 .. note::
 
-  If the experimental ``CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES`` is enabled,
-  files named ``<PackageName>.cps`` and ``<lowercasePackageName>.cps`` are
-  also considered, unless ``CONFIGS`` is given.
+  Because CPS files are not permitted to have names that do *not* match the
+  package name, specifying ``CONFIGS`` will suppress searcing for CPS files.
 
 All configuration files which have been considered by CMake while
 searching for the package with an appropriate version are stored in the
@@ -396,7 +403,7 @@ Each entry is meant for installation trees following Windows (``W``), UNIX
 
 .. [#p1] .. versionadded:: 3.25
 
-.. [#p2] .. versionadded:: 4.0
+.. [#p2] .. versionadded:: 4.3
 
 On systems supporting macOS :prop_tgt:`FRAMEWORK` and :prop_tgt:`BUNDLE`, the
 following directories are searched for Frameworks or Application Bundles
@@ -416,7 +423,7 @@ containing a configuration file:
  ``<prefix>/<name>.app/Contents/Resources/CMake/``                 A
 =============================================================== ==========
 
-.. [#p3] .. versionadded:: 4.0
+.. [#p3] .. versionadded:: 4.3
 
 When searching the above paths, ``find_package`` will only look for ``.cps``
 files in search paths which contain ``/cps/``, and will only look for
@@ -986,15 +993,6 @@ for the package.  The package configuration file may set
 ``<PackageName>_FOUND`` to false to tell ``find_package`` that component
 requirements are not satisfied.
 
-.. _CPS: https://cps-org.github.io/cps/
-.. |CPS| replace:: Common Package Specification
-
-.. _cps-compat_version: https://cps-org.github.io/cps/schema.html#compat-version
-.. |cps-compat_version| replace:: ``compat_version``
-
-.. _cps-version_schema: https://cps-org.github.io/cps/schema.html#version-schema
-.. |cps-version_schema| replace:: ``version_schema``
-
 CPS Transitive Requirements
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1028,3 +1026,12 @@ internal check that the candidate package supplied the required imported
 targets.  Those targets must be named ``<PackageName>::<ComponentName>``, in
 conformance with CPS convention, or the check will consider the package not
 found.
+
+.. _CPS: https://cps-org.github.io/cps/
+.. |CPS| replace:: Common Package Specification
+
+.. _cps-compat_version: https://cps-org.github.io/cps/schema.html#compat-version
+.. |cps-compat_version| replace:: ``compat_version``
+
+.. _cps-version_schema: https://cps-org.github.io/cps/schema.html#version-schema
+.. |cps-version_schema| replace:: ``version_schema``

Help/command/install.rst

@@ -975,10 +975,7 @@ Signatures
 .. signature::
   install(PACKAGE_INFO <package-name> [...])
 
-  .. versionadded:: 3.31
-  .. note::
-
-    Experimental. Gated by ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO``.
+  .. versionadded:: 4.3
 
   Installs a |CPS|_ ("CPS") file exporting targets for dependent projects:
 

Help/command/project.rst

@@ -89,10 +89,7 @@ The options are:
     :variable:`CMAKE_PROJECT_VERSION`.
 
 ``COMPAT_VERSION <version>``
-  .. versionadded:: 4.1
-  .. note::
-
-    Experimental. Gated by ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO``.
+  .. versionadded:: 4.3
 
   Optional; requires ``VERSION`` also be set.
 
@@ -101,17 +98,14 @@ The options are:
   and sets the variables
 
   * :variable:`PROJECT_COMPAT_VERSION`,
-    :variable:`<PROJECT-NAME>_COMPAT_VERSION`
+    :variable:`<PROJECT-NAME>_COMPAT_VERSION`.
 
-    When the ``project()`` command is called from the top-level
-    ``CMakeLists.txt``, then the compatibility version is also stored in the
-    variable :variable:`CMAKE_PROJECT_COMPAT_VERSION`.
+  When the ``project()`` command is called from the top-level
+  ``CMakeLists.txt``, then the compatibility version is also stored in the
+  variable :variable:`CMAKE_PROJECT_COMPAT_VERSION`.
 
 ``SPDX_LICENSE <license-string>``
-  .. versionadded:: 4.2
-  .. note::
-
-    Experimental. Gated by ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO``.
+  .. versionadded:: 4.3
 
   Optional.
   Sets the variables

Help/dev/experimental.rst

@@ -39,31 +39,11 @@ When activated, this experimental feature provides the following:
   using the ``CMAKE_EXPORT_FIND_PACKAGE_NAME`` variable and/or
 ``EXPORT_FIND_PACKAGE_NAME`` target property.
 
-Export |CPS| Package Information
-================================
-
-In order to activate support for this experimental feature, set
-
-* variable ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO`` to
-* value ``7fa7d13b-8308-4dc7-af39-9e450456d68f``.
-
-This UUID may change in future versions of CMake.  Be sure to use the value
-documented here by the source tree of the version of CMake with which you are
-experimenting.
-
-When activated, this experimental feature provides the following:
-
-* The experimental ``export(PACKAGE_INFO)`` and ``install(PACKAGE_INFO)``
-  commands are available to export package information in the |CPS|_ format.
-  See :command:`install(PACKAGE_INFO)` for a complete overview of the command.
-
 Export |CPS| Package Information for ``install(EXPORT)``
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+========================================================
 
 In order to activate support for this experimental feature, set
 
-* variable ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO`` to
-* value ``b80be207-778e-46ba-8080-b23bba22639e``.
 * variable ``CMAKE_EXPERIMENTAL_MAPPED_PACKAGE_INFO`` to
 * value ``ababa1b5-7099-495f-a9cd-e22d38f274f2``.
 
@@ -76,24 +56,6 @@ When activated, this experimental feature provides the following:
 * Setting ``CMAKE_INSTALL_EXPORTS_AS_PACKAGE_INFO`` enables generation of
   package information in the |CPS|_ format via the ``install(EXPORT)`` command.
 
-Find/Import |CPS| Packages
-==========================
-
-In order to activate support for this experimental feature, set
-
-* variable ``CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES`` to
-* value ``e82e467b-f997-4464-8ace-b00808fff261``.
-
-This UUID may change in future versions of CMake.  Be sure to use the value
-documented here by the source tree of the version of CMake with which you are
-experimenting.
-
-When activated, this experimental feature provides the following:
-
-* The :command:`find_package` command will also search for packages which are
-  described using |CPS|_. Refer to the :command:`find_package` documentation
-  for details.
-
 Build database support
 ======================
 

Help/variable/CMAKE_PROJECT_COMPAT_VERSION.rst

@@ -1,24 +1,20 @@
 CMAKE_PROJECT_COMPAT_VERSION
 ----------------------------
 
-.. versionadded:: 4.1
-
-.. note::
-
-  Experimental. Gated by ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO``.
+.. versionadded:: 4.3
 
 The compatibility version of the top level project.
 
-This variable holds the compatibility version of the project as specified in the
-top level CMakeLists.txt file by a :command:`project` command.  In the event
-that the top level CMakeLists.txt contains multiple :command:`project` calls,
-the most recently called one from that top level CMakeLists.txt will determine
-the value that ``CMAKE_PROJECT_COMPAT_VERSION`` contains.  For example, consider
-the following top level CMakeLists.txt:
+This variable holds the compatibility version of the project as specified in
+the top level CMakeLists.txt file by a :command:`project` command.  In the
+event that the top level CMakeLists.txt contains multiple :command:`project`
+calls, the most recently called one from that top level CMakeLists.txt will
+determine the value that ``CMAKE_PROJECT_COMPAT_VERSION`` contains.  For
+example, consider the following top level CMakeLists.txt:
 
 .. code-block:: cmake
 
-  cmake_minimum_required(VERSION 4.1)
+  cmake_minimum_required(VERSION 4.3)
   project(First VERSION 9.0 COMPAT_VERSION 1.2.3)
   project(Second VERSION 9.0 COMPAT_VERSION 3.4.5)
   add_subdirectory(sub)
@@ -36,6 +32,6 @@ CMakeLists.txt would be ``project(Second ...)``, so this will print::
 
   CMAKE_PROJECT_COMPAT_VERSION = 3.4.5
 
-To obtain the version from the most recent call to :command:`project` in
-the current directory scope or above, see the :variable:`PROJECT_COMPAT_VERSION`
-variable.
+To obtain the version from the most recent call to :command:`project`
+in the current directory scope or above, see the
+:variable:`PROJECT_COMPAT_VERSION` variable.

Help/variable/CMAKE_PROJECT_SPDX_LICENSE.rst

@@ -1,11 +1,7 @@
 CMAKE_PROJECT_SPDX_LICENSE
 --------------------------
 
-.. versionadded:: 4.2
-
-.. note::
-
-  Experimental. Gated by ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO``.
+.. versionadded:: 4.3
 
 The license(s) of the top level project.
 
@@ -18,7 +14,7 @@ the following top level CMakeLists.txt:
 
 .. code-block:: cmake
 
-  cmake_minimum_required(VERSION 4.2)
+  cmake_minimum_required(VERSION 4.3)
   project(First SPDX_LICENSE "BSD-3-Clause")
   project(Second SPDX_LICENSE "BSD-3-Clause AND CC-BY-SA-4.0")
   add_subdirectory(sub)

Help/variable/PROJECT-NAME_COMPAT_VERSION.rst

@@ -1,11 +1,7 @@
 <PROJECT-NAME>_COMPAT_VERSION
 -----------------------------
 
-.. versionadded:: 4.1
-
-.. note::
-
-  Experimental. Gated by ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO``.
+.. versionadded:: 4.3
 
 Value given to the ``COMPAT_VERSION`` option of the most recent call to the
 :command:`project` command with project name ``<PROJECT-NAME>``, if any.

Help/variable/PROJECT-NAME_SPDX_LICENSE.rst

@@ -1,11 +1,7 @@
 <PROJECT-NAME>_SPDX_LICENSE
 ---------------------------
 
-.. versionadded:: 4.2
-
-.. note::
-
-  Experimental. Gated by ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO``.
+.. versionadded:: 4.3
 
 Value given to the ``SPDX_LICENSE`` option of the most recent call to the
 :command:`project` command with project name ``<PROJECT-NAME>``, if any.

Help/variable/PROJECT_COMPAT_VERSION.rst

@@ -1,11 +1,7 @@
 PROJECT_COMPAT_VERSION
 ----------------------
 
-.. versionadded:: 4.1
-
-.. note::
-
-  Experimental. Gated by ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO``.
+.. versionadded:: 4.3
 
 Value given to the ``COMPAT_VERSION`` option of the most recent call to the
 :command:`project` command, if any. To obtain the compatibility version of the

Help/variable/PROJECT_SPDX_LICENSE.rst

@@ -1,11 +1,7 @@
 PROJECT_SPDX_LICENSE
 --------------------
 
-.. versionadded:: 4.2
-
-.. note::
-
-  Experimental. Gated by ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO``.
+.. versionadded:: 4.3
 
 Value given to the ``SPDX_LICENSE`` option of the most recent call to the
 :command:`project` command, if any. To obtain the compatibility version of the

Source/cmExperimental.cxx

@@ -29,24 +29,6 @@ cmExperimental::FeatureData const LookupTable[] = {
     "only for experimentation and feedback to CMake developers.",
     {},
     cmExperimental::TryCompileCondition::Always },
-  // ImportPackageInfo
-  { "ImportPackageInfo",
-    "e82e467b-f997-4464-8ace-b00808fff261",
-    "CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES",
-    "CMake's support for importing package information in the Common Package "
-    "Specification format (via find_package) is experimental. It is meant "
-    "only for experimentation and feedback to CMake developers.",
-    {},
-    cmExperimental::TryCompileCondition::Always },
-  // ExportPackageInfo
-  { "ExportPackageInfo",
-    "7fa7d13b-8308-4dc7-af39-9e450456d68f",
-    "CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO",
-    "CMake's support for exporting package information in the Common Package "
-    "Specification format is experimental. It is meant only for "
-    "experimentation and feedback to CMake developers.",
-    {},
-    cmExperimental::TryCompileCondition::Always },
   // MappedPackageInfo
   { "MappedPackageInfo",
     "ababa1b5-7099-495f-a9cd-e22d38f274f2",

Source/cmExperimental.h

@@ -18,8 +18,6 @@ public:
   enum class Feature
   {
     ExportPackageDependencies,
-    ImportPackageInfo,
-    ExportPackageInfo,
     MappedPackageInfo,
     ExportBuildDatabase,
     GenerateSbom,

Source/cmExportCommand.cxx

@@ -401,12 +401,6 @@ static bool HandleSpecialExportMode(std::vector<std::string> const& args,
 static bool HandlePackageInfoMode(std::vector<std::string> const& args,
                                   cmExecutionStatus& status)
 {
-  if (!cmExperimental::HasSupportEnabled(
-        status.GetMakefile(), cmExperimental::Feature::ExportPackageInfo)) {
-    status.SetError("does not recognize sub-command PACKAGE_INFO");
-    return false;
-  }
-
   using arg_t = cmPackageInfoArguments;
   using gen_t = cmExportBuildPackageInfoGenerator;
   return HandleSpecialExportMode<arg_t, gen_t>(args, status);

Source/cmFindPackageCommand.cxx

@@ -27,7 +27,6 @@
 #include "cmConfigureLog.h"
 #include "cmDependencyProvider.h"
 #include "cmExecutionStatus.h"
-#include "cmExperimental.h"
 #include "cmFindPackageStack.h"
 #include "cmList.h"
 #include "cmListFileCache.h"
@@ -926,9 +925,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   // Check and eliminate search modes not allowed by the args provided
   this->UseFindModules = configArgs.empty();
   this->UseConfigFiles = moduleArgs.empty();
-  if (this->UseConfigFiles &&
-      cmExperimental::HasSupportEnabled(
-        *this->Makefile, cmExperimental::Feature::ImportPackageInfo)) {
+  if (this->UseConfigFiles) {
     this->UseCpsFiles = this->Configs.empty();
   } else {
     this->UseCpsFiles = false;

Source/cmInstallCommand.cxx

@@ -2286,8 +2286,6 @@ bool HandleExportMode(std::vector<std::string> const& args,
 #ifndef CMAKE_BOOTSTRAP
   // Check if PACKAGE_INFO export has been requested for this export set.
   if (cmExperimental::HasSupportEnabled(
-        status.GetMakefile(), cmExperimental::Feature::ExportPackageInfo) &&
-      cmExperimental::HasSupportEnabled(
         status.GetMakefile(), cmExperimental::Feature::MappedPackageInfo)) {
     if (cmValue const& piExports = helper.Makefile->GetDefinition(
           "CMAKE_INSTALL_EXPORTS_AS_PACKAGE_INFO")) {
@@ -2321,12 +2319,6 @@ bool HandlePackageInfoMode(std::vector<std::string> const& args,
                            cmExecutionStatus& status)
 {
 #ifndef CMAKE_BOOTSTRAP
-  if (!cmExperimental::HasSupportEnabled(
-        status.GetMakefile(), cmExperimental::Feature::ExportPackageInfo)) {
-    status.SetError("does not recognize sub-command PACKAGE_INFO");
-    return false;
-  }
-
   Helper helper(status);
 
   // This is the PACKAGE_INFO mode.

Source/cmProjectCommand.cxx

@@ -17,7 +17,6 @@
 #include "cmArgumentParser.h"
 #include "cmArgumentParserTypes.h"
 #include "cmExecutionStatus.h"
-#include "cmExperimental.h"
 #include "cmList.h"
 #include "cmMakefile.h"
 #include "cmMessageType.h"
@@ -68,24 +67,18 @@ bool cmProjectCommand(std::vector<std::string> const& args,
   parser.BindKeywordMissingValue(missingValueKeywords)
     .BindParsedKeywords(parsedKeywords)
     .Bind("VERSION"_s, prArgs.Version)
+    .Bind("COMPAT_VERSION"_s, prArgs.CompatVersion)
+    .Bind("SPDX_LICENSE"_s, prArgs.License)
     .Bind("DESCRIPTION"_s, prArgs.Description)
     .Bind("HOMEPAGE_URL"_s, prArgs.HomepageURL)
     .Bind("LANGUAGES"_s, prArgs.Languages);
 
-  cmMakefile& mf = status.GetMakefile();
-  bool enablePackageInfo = cmExperimental::HasSupportEnabled(
-    mf, cmExperimental::Feature::ExportPackageInfo);
-
-  if (enablePackageInfo) {
-    parser.Bind("COMPAT_VERSION"_s, prArgs.CompatVersion);
-    parser.Bind("SPDX_LICENSE"_s, prArgs.License);
-  }
-
   if (args.empty()) {
     status.SetError("PROJECT called with incorrect number of arguments");
     return false;
   }
 
+  cmMakefile& mf = status.GetMakefile();
   std::string const& projectName = args[0];
   if (parser.HasKeyword(projectName)) {
     mf.IssueMessage(

Tests/FindPackageCpsTest/CMakeLists.txt

@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.31)
 project(FindPackageCpsTest)
 
-set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261")
-
 # Protect tests from running inside the default install prefix.
 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix")
 

Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake

@@ -274,22 +274,19 @@ function (run_cxx_module_import_test type name)
   run_cxx_module_test(imp-mods "imp-mods-${name}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/${name}-${type}" ${ARGN})
 endfunction ()
 
-set(export_cps "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO=7fa7d13b-8308-4dc7-af39-9e450456d68f")
-set(import_cps "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261")
-
 # Tests which install BMIs
 if ("export_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
   run_cxx_module_test(exp-iface-no-props-build)
-  run_cxx_module_test(exp-iface-build exp-iface-build ${export_cps})
-  run_cxx_module_test(exp-incdirs-build exp-incdirs-build ${export_cps})
+  run_cxx_module_test(exp-iface-build)
+  run_cxx_module_test(exp-incdirs-build)
   run_cxx_module_test(exp-incdirs-old-cmake-build)
   run_cxx_module_test(exp-usage-build)
   run_cxx_module_test(exp-bmi-and-iface-build)
-  run_cxx_module_test(exp-command-sepdir-build exp-command-sepdir-build ${export_cps})
+  run_cxx_module_test(exp-command-sepdir-build)
   run_cxx_module_test(exp-trans-targets-build)
-  run_cxx_module_test(exp-trans-mods1-build exp-trans-mods1-build ${export_cps})
-  run_cxx_module_test(exp-trans-mods-build exp-trans-mods-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/exp-trans-mods1-build-build" "-Dexport_transitive_modules1_cps_DIR=${RunCMake_BINARY_DIR}/exp-trans-mods1-build-build" ${export_cps} ${import_cps})
-  run_cxx_module_test(exp-with-headers-build exp-with-headers-build ${export_cps})
+  run_cxx_module_test(exp-trans-mods1-build)
+  run_cxx_module_test(exp-trans-mods-build exp-trans-mods-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/exp-trans-mods1-build-build" "-Dexport_transitive_modules1_cps_DIR=${RunCMake_BINARY_DIR}/exp-trans-mods1-build-build")
+  run_cxx_module_test(exp-with-headers-build)
 
   if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION AND
       "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION)
@@ -322,16 +319,16 @@ if ("install_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
 
   if ("export_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
     run_cxx_module_test(exp-iface-no-props-install)
-    run_cxx_module_test(exp-iface-install exp-iface-install ${export_cps})
-    run_cxx_module_test(exp-incdirs-install exp-incdirs-install ${export_cps})
+    run_cxx_module_test(exp-iface-install)
+    run_cxx_module_test(exp-incdirs-install)
     run_cxx_module_test(exp-incdirs-old-cmake-install)
     run_cxx_module_test(exp-usage-install)
     run_cxx_module_test(exp-bmi-and-iface-install)
-    run_cxx_module_test(exp-command-sepdir-install exp-command-sepdir-install ${export_cps})
+    run_cxx_module_test(exp-command-sepdir-install)
     run_cxx_module_test(exp-trans-targets-install)
-    run_cxx_module_test(exp-trans-mods1-install exp-trans-mods1-install ${export_cps})
-    run_cxx_module_test(exp-trans-mods-install exp-trans-mods-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/exp-trans-mods1-install-install" "-Dexport_transitive_modules1_cps_DIR=${RunCMake_BINARY_DIR}/exp-trans-mods1-install-install/lib/cmake/export_transitive_modules1_cps" ${export_cps} ${import_cps})
-    run_cxx_module_test(exp-with-headers-install exp-with-headers-install ${export_cps})
+    run_cxx_module_test(exp-trans-mods1-install)
+    run_cxx_module_test(exp-trans-mods-install exp-trans-mods-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/exp-trans-mods1-install-install" "-Dexport_transitive_modules1_cps_DIR=${RunCMake_BINARY_DIR}/exp-trans-mods1-install-install/lib/cmake/export_transitive_modules1_cps")
+    run_cxx_module_test(exp-with-headers-install)
 
     if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION AND
         "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION)

Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-build-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-build/CMakeLists.txt

@@ -36,7 +36,6 @@ add_test(NAME export_sepdir_build
     "-Dexpected_dir=${CMAKE_CURRENT_SOURCE_DIR}"
     "-Dexport_sepdir_DIR=${CMAKE_CURRENT_BINARY_DIR}"
     "-Dexport_sepdir_cps_DIR=${CMAKE_CURRENT_BINARY_DIR}"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-install-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-install/CMakeLists.txt

@@ -40,7 +40,6 @@ add_test(NAME export_sepdir_build
     "-Dexpected_dir=${CMAKE_INSTALL_PREFIX}/lib/cxx/miu"
     "-Dexport_sepdir_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_sepdir"
     "-Dexport_sepdir_cps_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_sepdir_cps"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-iface-build-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-iface-build/CMakeLists.txt

@@ -58,7 +58,6 @@ add_test(NAME export_interfaces_build
     "-Dexpected_binary_dir=${CMAKE_CURRENT_BINARY_DIR}"
     "-Dexport_interfaces_DIR=${CMAKE_CURRENT_BINARY_DIR}"
     "-Dexport_interfaces_cps_DIR=${CMAKE_CURRENT_BINARY_DIR}"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-iface-install-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-iface-install/CMakeLists.txt

@@ -62,7 +62,6 @@ add_test(NAME export_interfaces_build
     "-Dexpected_binary_dir=${CMAKE_INSTALL_PREFIX}/lib/cxx/bmi"
     "-Dexport_interfaces_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_interfaces"
     "-Dexport_interfaces_cps_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_interfaces_cps"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-incdirs-build-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/CMakeLists.txt

@@ -64,7 +64,6 @@ add_test(NAME export_include_directories_build
     "-Dexpected_binary_dir=${CMAKE_CURRENT_BINARY_DIR}"
     "-Dexport_include_directories_DIR=${CMAKE_CURRENT_BINARY_DIR}"
     "-Dexport_include_directories_cps_DIR=${CMAKE_CURRENT_BINARY_DIR}"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-incdirs-install-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/CMakeLists.txt

@@ -74,7 +74,6 @@ add_test(NAME export_include_directories_build
     "-Dexpected_binary_dir=${CMAKE_INSTALL_PREFIX}/lib/cxx/bmi"
     "-Dexport_include_directories_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_include_directories"
     "-Dexport_include_directories_cps_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_include_directories_cps"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-trans-mods-build-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-trans-mods-build/CMakeLists.txt

@@ -71,7 +71,6 @@ add_test(NAME export_transitive_modules_build
     "-Dexport_transitive_modules_DIR=${CMAKE_CURRENT_BINARY_DIR}"
     "-Dexport_transitive_modules1_cps_DIR=${CMAKE_PREFIX_PATH}"
     "-Dexport_transitive_modules_cps_DIR=${CMAKE_CURRENT_BINARY_DIR}"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-trans-mods-install-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-trans-mods-install/CMakeLists.txt

@@ -75,7 +75,6 @@ add_test(NAME export_transitive_modules_build
     "-Dexport_transitive_modules_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_transitive_modules"
     "-Dexport_transitive_modules1_cps_DIR=${CMAKE_PREFIX_PATH}/lib/cmake/export_transitive_modules1_cps"
     "-Dexport_transitive_modules_cps_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_transitive_modules_cps"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-build-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-build/CMakeLists.txt

@@ -47,7 +47,6 @@ add_test(NAME export_transitive_modules1_build
     "-Dexpected_binary_dir=${CMAKE_CURRENT_BINARY_DIR}"
     "-Dexport_transitive_modules1_DIR=${CMAKE_CURRENT_BINARY_DIR}"
     "-Dexport_transitive_modules1_cps_DIR=${CMAKE_CURRENT_BINARY_DIR}"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-install-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-install/CMakeLists.txt

@@ -51,7 +51,6 @@ add_test(NAME export_transitive_modules1_build
     "-Dexpected_binary_dir=${CMAKE_INSTALL_PREFIX}/lib/cxx/bmi"
     "-Dexport_transitive_modules1_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_transitive_modules1"
     "-Dexport_transitive_modules1_cps_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_transitive_modules1_cps"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-with-headers-build-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-with-headers-build/CMakeLists.txt

@@ -48,7 +48,6 @@ add_test(NAME export_with_headers_build
     "${CMAKE_COMMAND}"
     "-Dexport_with_headers_DIR=${CMAKE_CURRENT_BINARY_DIR}"
     "-Dexport_with_headers_cps_DIR=${CMAKE_CURRENT_BINARY_DIR}"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CXXModulesCompile/exp-with-headers-install-stderr.txt

@@ -1,5 +0,0 @@
-CMake Warning \(dev\) at CMakeLists\.txt:[0-9]+ \(project\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-This warning is for project developers\.  Use -Wno-dev to suppress it

Tests/RunCMake/CXXModulesCompile/exp-with-headers-install/CMakeLists.txt

@@ -51,7 +51,6 @@ add_test(NAME export_with_headers_build
     "${CMAKE_COMMAND}"
     "-Dexport_with_headers_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_with_headers"
     "-Dexport_with_headers_cps_DIR=${CMAKE_INSTALL_PREFIX}/lib/cmake/export_with_headers_cps"
-    "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES=e82e467b-f997-4464-8ace-b00808fff261"
     ${generator}
     -S "${CMAKE_CURRENT_SOURCE_DIR}/test"
     -B "${CMAKE_CURRENT_BINARY_DIR}/test")

Tests/RunCMake/CpsExportImportBuild/RunCMakeTest.cmake

@@ -1,11 +1,5 @@
 include(RunCMake)
 
-set(RunCMake_TEST_OPTIONS
-  -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
-  "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  )
-
 function(build_project test)
   set(RunCMake_TEST_NO_CLEAN FALSE)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}-build)

Tests/RunCMake/CpsExportImportInstall/RunCMakeTest.cmake

@@ -1,11 +1,5 @@
 include(RunCMake)
 
-set(RunCMake_TEST_OPTIONS
-  -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
-  "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  )
-
 function(build_project test)
   set(RunCMake_TEST_NO_CLEAN FALSE)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}-build)

Tests/RunCMake/CpsMapConfig/RunCMakeTest.cmake

@@ -1,10 +1,5 @@
 include(RunCMake)
 
-set(RunCMake_TEST_OPTIONS
-  -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  )
-
 function(build_project test)
   set(RunCMake_TEST_NO_CLEAN FALSE)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}-build)

Tests/RunCMake/DependencyProviders/RedirectFetchContentSerial-stderr.txt

@@ -2,6 +2,8 @@ CMake Error at set_provider\.cmake:[0-9]+ \(find_package\):
   Could not find a package configuration file provided by "SomeDep" with any
   of the following names:
 
+    SomeDep\.cps
+    somedep\.cps
     SomeDepConfig\.cmake
     somedep-config\.cmake
 

Tests/RunCMake/EnvSbom/RunCMakeTest.cmake

@@ -3,8 +3,6 @@ include(RunCMake)
 set(common_test_options
   -Wno-dev
   "-DCMAKE_EXPERIMENTAL_GENERATE_SBOM:STRING=ca494ed3-b261-4205-a01f-603c95e4cae0"
-  "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
   "-DCMAKE_INSTALL_SBOM_FORMATS:STRING=JSON"
   "-DCMAKE_INSTALL_LIBDIR=lib"
 )

Tests/RunCMake/ExportPackageInfo/ExperimentalGate-result.txt

@@ -1 +0,0 @@
-1

Tests/RunCMake/ExportPackageInfo/ExperimentalGate-stderr.txt

@@ -1,2 +0,0 @@
-CMake Error at ExperimentalGate\.cmake:5 \(export\):
-  export does not recognize sub-command PACKAGE_INFO

Tests/RunCMake/ExportPackageInfo/ExperimentalGate.cmake

@@ -1,5 +0,0 @@
-unset(CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO)
-
-add_library(foo INTERFACE)
-install(TARGETS foo EXPORT foo DESTINATION .)
-export(PACKAGE_INFO foo EXPORT foo)

Tests/RunCMake/ExportPackageInfo/ExperimentalWarning-stderr.txt

@@ -1,7 +0,0 @@
-CMake Warning \(dev\) at ExperimentalWarning\.cmake:8 \(export\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-Call Stack \(most recent call first\):
-  CMakeLists\.txt:3 \(include\)
-This warning is for project developers\.  Use -Wno-dev to suppress it\.

Tests/RunCMake/ExportPackageInfo/ExperimentalWarning.cmake

@@ -1,8 +0,0 @@
-set(
-  CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
-  "7fa7d13b-8308-4dc7-af39-9e450456d68f"
-  )
-
-add_library(foo INTERFACE)
-install(TARGETS foo EXPORT foo DESTINATION .)
-export(PACKAGE_INFO foo EXPORT foo)

Tests/RunCMake/ExportPackageInfo/RunCMakeTest.cmake

@@ -1,20 +1,5 @@
 include(RunCMake)
 
-# Test experimental gate
-run_cmake(ExperimentalGate)
-run_cmake(ExperimentalWarning)
-
-# Test version check author warning
-# TODO Move to be with other tests when experimental gate is removed.
-run_cmake(VersionCheckWarning)
-
-# Enable experimental feature and suppress warnings
-set(RunCMake_TEST_OPTIONS
-  -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
-  "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  )
-
 # Test incorrect usage
 run_cmake(BadArgs0)
 run_cmake(BadArgs1)
@@ -55,5 +40,5 @@ run_cmake(DependencyVersionCMake)
 run_cmake(DependencyVersionCps)
 run_cmake(TransitiveSymbolicComponent)
 run_cmake(VersionCheck)
-# run_cmake(VersionCheckWarning)
+run_cmake(VersionCheckWarning)
 run_cmake(VersionCheckError)

Tests/RunCMake/ExportPackageInfo/VersionCheckWarning.cmake

@@ -1,8 +1,3 @@
-set(
-  CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
-  "7fa7d13b-8308-4dc7-af39-9e450456d68f"
-)
-
 add_library(foo INTERFACE)
 install(TARGETS foo EXPORT foo DESTINATION .)
 

Tests/RunCMake/ExportSbom/RunCMakeTest.cmake

@@ -3,8 +3,6 @@ include(RunCMake)
 set(common_test_options
   -Wno-dev
   "-DCMAKE_EXPERIMENTAL_GENERATE_SBOM:STRING=ca494ed3-b261-4205-a01f-603c95e4cae0"
-  "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
 )
 
 function(run_cmake_install test)

Tests/RunCMake/InstallExportsAsPackageInfo/ExperimentalWarning-stderr.txt

@@ -1,4 +1,4 @@
-CMake Warning \(dev\) at ExperimentalWarning\.cmake:13 \(install\):
+CMake Warning \(dev\) at ExperimentalWarning\.cmake:[0-9]+ \(install\):
   CMake's support for generating package information in the Common Package
   Specification format from CMake script exports is experimental\.  It is
   meant only for experimentation and feedback to CMake developers\.

Tests/RunCMake/InstallExportsAsPackageInfo/ExperimentalWarning.cmake

@@ -1,7 +1,3 @@
-set(
-  CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
-  "7fa7d13b-8308-4dc7-af39-9e450456d68f"
-  )
 set(
   CMAKE_EXPERIMENTAL_MAPPED_PACKAGE_INFO
   "ababa1b5-7099-495f-a9cd-e22d38f274f2"

Tests/RunCMake/InstallExportsAsPackageInfo/RunCMakeTest.cmake

@@ -7,7 +7,6 @@ run_cmake(ExperimentalWarning)
 # Enable experimental feature and suppress warnings
 set(RunCMake_TEST_OPTIONS
   -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
   "-DCMAKE_EXPERIMENTAL_MAPPED_PACKAGE_INFO:STRING=ababa1b5-7099-495f-a9cd-e22d38f274f2"
   )
 

Tests/RunCMake/InstallPackageInfo/ExperimentalGate-result.txt

@@ -1 +0,0 @@
-1

Tests/RunCMake/InstallPackageInfo/ExperimentalGate-stderr.txt

@@ -1,2 +0,0 @@
-CMake Error at ExperimentalGate\.cmake:5 \(install\):
-  install does not recognize sub-command PACKAGE_INFO

Tests/RunCMake/InstallPackageInfo/ExperimentalGate.cmake

@@ -1,5 +0,0 @@
-unset(CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO)
-
-add_library(foo INTERFACE)
-install(TARGETS foo EXPORT foo DESTINATION .)
-install(PACKAGE_INFO foo DESTINATION cps EXPORT foo)

Tests/RunCMake/InstallPackageInfo/ExperimentalWarning-stderr.txt

@@ -1,7 +0,0 @@
-CMake Warning \(dev\) at ExperimentalWarning\.cmake:8 \(install\):
-  CMake's support for exporting package information in the Common Package
-  Specification format is experimental\.  It is meant only for experimentation
-  and feedback to CMake developers\.
-Call Stack \(most recent call first\):
-  CMakeLists\.txt:3 \(include\)
-This warning is for project developers\.  Use -Wno-dev to suppress it\.

Tests/RunCMake/InstallPackageInfo/ExperimentalWarning.cmake

@@ -1,8 +0,0 @@
-set(
-  CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
-  "7fa7d13b-8308-4dc7-af39-9e450456d68f"
-  )
-
-add_library(foo INTERFACE)
-install(TARGETS foo EXPORT foo DESTINATION .)
-install(PACKAGE_INFO foo DESTINATION cps EXPORT foo)

Tests/RunCMake/InstallPackageInfo/RunCMakeTest.cmake

@@ -1,20 +1,5 @@
 include(RunCMake)
 
-# Test experimental gate
-run_cmake(ExperimentalGate)
-run_cmake(ExperimentalWarning)
-
-# Test version check author warning
-# TODO Move to be with other tests when experimental gate is removed.
-run_cmake(VersionCheckWarning)
-
-# Enable experimental feature and suppress warnings
-set(RunCMake_TEST_OPTIONS
-  -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
-  "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  )
-
 function(run_cmake_install test)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}-build)
   if (NOT RunCMake_GENERATOR_IS_MULTI_CONFIG)
@@ -64,6 +49,6 @@ run_cmake(DependencyVersionCps)
 run_cmake(TransitiveSymbolicComponent)
 run_cmake(InstallSymbolicComponent)
 run_cmake(VersionCheck)
-# run_cmake(VersionCheckWarning)
+run_cmake(VersionCheckWarning)
 run_cmake(VersionCheckError)
 run_cmake_install(Destination)

Tests/RunCMake/InstallPackageInfo/VersionCheckWarning.cmake

@@ -1,8 +1,3 @@
-set(
-  CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
-  "7fa7d13b-8308-4dc7-af39-9e450456d68f"
-)
-
 add_library(foo INTERFACE)
 install(TARGETS foo EXPORT foo DESTINATION .)
 

Tests/RunCMake/InstallSbom/RunCMakeTest.cmake

@@ -3,8 +3,6 @@ include(RunCMake)
 set(common_test_options
   -Wno-dev
   "-DCMAKE_EXPERIMENTAL_GENERATE_SBOM:STRING=ca494ed3-b261-4205-a01f-603c95e4cae0"
-  "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
 )
 
 function(run_cmake_install test)

Tests/RunCMake/find_package-CPS/ExperimentalWarning-stderr.txt

@@ -1,27 +0,0 @@
-CMake Warning \(dev\) at ExperimentalWarning\.cmake:[0-9]+ \(find_package\):
-  CMake's support for importing package information in the Common Package
-  Specification format \(via find_package\) is experimental\.  It is meant only
-  for experimentation and feedback to CMake developers\.
-Call Stack \(most recent call first\):
-  CMakeLists\.txt:3 \(include\)
-This warning is for project developers\.  Use -Wno-dev to suppress it\.
-
-CMake Warning at ExperimentalWarning\.cmake:[0-9]+ \(find_package\):
-  By not providing "FindDoesNotExist\.cmake" in CMAKE_MODULE_PATH this project
-  has asked CMake to find a package configuration file provided by
-  "DoesNotExist", but CMake did not find one\.
-
-  Could not find a package configuration file provided by "DoesNotExist" with
-  any of the following names:
-
-    DoesNotExist\.cps
-    doesnotexist\.cps
-    DoesNotExistConfig\.cmake
-    doesnotexist-config\.cmake
-
-  Add the installation prefix of "DoesNotExist" to CMAKE_PREFIX_PATH or set
-  "DoesNotExist_DIR" to a directory containing one of the above files\.  If
-  "DoesNotExist" provides a separate development package or SDK, be sure it
-  has been installed\.
-Call Stack \(most recent call first\):
-  CMakeLists\.txt:3 \(include\)

Tests/RunCMake/find_package-CPS/ExperimentalWarning.cmake

@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 4.0)
-
-set(
-  CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES
-  "e82e467b-f997-4464-8ace-b00808fff261"
-  )
-
-include(Setup.cmake)
-
-find_package(DoesNotExist)

Tests/RunCMake/find_package-CPS/RunCMakeTest.cmake

@@ -1,13 +1,5 @@
 include(RunCMake)
 
-run_cmake(ExperimentalWarning)
-
-# Enable experimental feature and suppress warnings
-set(RunCMake_TEST_OPTIONS
-  -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  )
-
 function(run_cmake_build test)
   set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}-build)
   if(${ARGC} EQUAL 2)

Tests/RunCMake/find_package/ConfigureLog-config.txt

@@ -19,10 +19,16 @@ events:(
     name: "ViaConfig"
     configs:
       -
-        filename: "ViaConfigConfig.cmake"
+        filename: "ViaConfig\.cps"
+        kind: "cps"
+      -
+        filename: "viaconfig\.cps"
+        kind: "cps"
+      -
+        filename: "ViaConfigConfig\.cmake"
         kind: "cmake"
       -
-        filename: "viaconfig-config.cmake"
+        filename: "viaconfig-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -48,31 +54,63 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/ViaConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/ViaConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/viaconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/viaconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ViaConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/ViaConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/viaconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/ViaConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/viaconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ViaConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/viaconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/viaconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ViaConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ViaConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/viaconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/viaconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ViaConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/viaconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ViaConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/viaconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ViaConfig/ViaConfigConfig.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ViaConfig/ViaConfigConfig\.cmake"
       mode: "config"
       version: "1\.0"
     search_context:(
@@ -104,9 +142,9 @@ events:(
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindViaModule.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindViaModule\.cmake"
       mode: "module"
-      version: "1.0"
+      version: "1\.0"
     search_context:(
       [^
 ]*)+
@@ -117,10 +155,16 @@ events:(
     name: "Inner"
     configs:
       -
-        filename: "InnerConfig.cmake"
+        filename: "Inner\.cps"
+        kind: "cps"
+      -
+        filename: "inner\.cps"
+        kind: "cps"
+      -
+        filename: "InnerConfig\.cmake"
         kind: "cmake"
       -
-        filename: "inner-config.cmake"
+        filename: "inner-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -146,33 +190,65 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/InnerConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/InnerConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/inner-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/inner-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/InnerConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/Inner\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/inner\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/Inner\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/inner\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/InnerConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/inner-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/inner-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/InnerConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/InnerConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/inner-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/inner-config\.cmake"
         mode: "config"
         reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/Inner\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/inner\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/Inner\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/inner\.cps"
+        mode: "cps"
+        reason: "no_exist"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/Inner/InnerConfig.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/Inner/InnerConfig\.cmake"
       mode: "config"
-      version: "1.1"
+      version: "1\.1"
     search_context:(
       [^
 ]*)+
@@ -202,9 +278,9 @@ events:(
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindWithInner.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindWithInner\.cmake"
       mode: "module"
-      version: "1.1"
+      version: "1\.1"
     search_context:(
       [^
 ]*)+
@@ -215,14 +291,20 @@ events:(
     name: "VersionCheck"
     configs:
       -
-        filename: "VersionCheckConfig.cmake"
+        filename: "VersionCheck\.cps"
+        kind: "cps"
+      -
+        filename: "versioncheck\.cps"
+        kind: "cps"
+      -
+        filename: "VersionCheckConfig\.cmake"
         kind: "cmake"
       -
-        filename: "versioncheck-config.cmake"
+        filename: "versioncheck-config\.cmake"
         kind: "cmake"
     version_request:
-      version: "2.0"
-      version_complete: "2.0"
+      version: "2\.0"
+      version_complete: "2\.0"
       exact: false
     settings:
       required: "optional"
@@ -246,42 +328,74 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/VersionCheckConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/VersionCheckConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/versioncheck-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/versioncheck-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/VersionCheckConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/VersionCheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/versioncheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/VersionCheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/versioncheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/VersionCheckConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/versioncheck-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/versioncheck-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/VersionCheckConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/VersionCheckConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/versioncheck-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/versioncheck-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/VersionCheck-1.5/VersionCheckConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/VersionCheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/versioncheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/VersionCheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/versioncheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/VersionCheck-1\.5/VersionCheckConfig\.cmake"
         mode: "config"
         reason: "insufficient_version"
-        message: "The version found is not compatible with the version requested."
+        message: "The version found is not compatible with the version requested\."
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/VersionCheck-1.5/versioncheck-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/VersionCheck-1\.5/versioncheck-config\.cmake"
         mode: "config"
         reason: "no_exist"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/VersionCheck-2.5/VersionCheckConfig.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/VersionCheck-2\.5/VersionCheckConfig\.cmake"
       mode: "config"
-      version: "2.5"
+      version: "2\.5"
     search_context:(
       [^
 ]*)+

Tests/RunCMake/find_package/ConfigureLog-stderr.txt

@@ -69,10 +69,18 @@
 
     .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/ViaConfigConfig\.cmake
     .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/viaconfig-config\.cmake
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/ViaConfig\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/viaconfig\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/ViaConfig\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/viaconfig\.cps
     .*/Tests/RunCMake/find_package/ConfigureLog/ViaConfigConfig\.cmake
     .*/Tests/RunCMake/find_package/ConfigureLog/viaconfig-config\.cmake
     .*/Tests/RunCMake/find_package/ConfigureLog/cmake/ViaConfigConfig\.cmake
     .*/Tests/RunCMake/find_package/ConfigureLog/cmake/viaconfig-config\.cmake
+    .*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ViaConfig\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/viaconfig\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ViaConfig\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog/share/cps/viaconfig\.cps
     .*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ViaConfig/ViaConfigConfig\.cmake
 
   The file was found at
@@ -165,12 +173,20 @@ CMake Debug Log at ConfigureLog/cmake/FindWithInner\.cmake:[0-9]+ \(find_package
 
   find_package considered the following locations for Inner's Config module:
 
-    .*/CMakeFiles/pkgRedirects/InnerConfig\.cmake
-    .*/CMakeFiles/pkgRedirects/inner-config\.cmake
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/InnerConfig\.cmake
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/inner-config\.cmake
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/Inner\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/inner\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/Inner\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/inner\.cps
     .*/Tests/RunCMake/find_package/ConfigureLog/InnerConfig\.cmake
     .*/Tests/RunCMake/find_package/ConfigureLog/inner-config\.cmake
     .*/Tests/RunCMake/find_package/ConfigureLog/cmake/InnerConfig\.cmake
     .*/Tests/RunCMake/find_package/ConfigureLog/cmake/inner-config\.cmake
+    .*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/Inner\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/inner\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog/share/cps/Inner\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog/share/cps/inner\.cps
     .*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/Inner/InnerConfig\.cmake
 
   The file was found at
@@ -266,12 +282,20 @@ CMake Debug Log at ConfigureLog\.cmake:[0-9]+ \(find_package\):
   find_package considered the following locations for VersionCheck's Config
   module:
 
-    .*/CMakeFiles/pkgRedirects/VersionCheckConfig\.cmake
-    .*/CMakeFiles/pkgRedirects/versioncheck-config\.cmake
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/VersionCheckConfig\.cmake
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/versioncheck-config\.cmake
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/VersionCheck\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/lib/cps/versioncheck\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/VersionCheck\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog-build/CMakeFiles/pkgRedirects/share/cps/versioncheck\.cps
     .*/Tests/RunCMake/find_package/ConfigureLog/VersionCheckConfig\.cmake
     .*/Tests/RunCMake/find_package/ConfigureLog/versioncheck-config\.cmake
     .*/Tests/RunCMake/find_package/ConfigureLog/cmake/VersionCheckConfig\.cmake
-    .*/Tests/RunCMake/find_package/ConfigureLog/cmake/versioncheck-config\.cmake(
+    .*/Tests/RunCMake/find_package/ConfigureLog/cmake/versioncheck-config\.cmake
+    .*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/VersionCheck\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/versioncheck\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog/share/cps/VersionCheck\.cps
+    .*/Tests/RunCMake/find_package/ConfigureLog/share/cps/versioncheck\.cps(
     .*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/VersionCheck-1\.5/VersionCheckConfig\.cmake
     .*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/VersionCheck-1\.5/versioncheck-config\.cmake)?
     .*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/VersionCheck-2\.5/VersionCheckConfig\.cmake

Tests/RunCMake/find_package/ConfigureLogParameters2-config.txt

@@ -19,10 +19,16 @@ events:(
     name: "ParameterCheckConfig"
     configs:
       -
-        filename: "ParameterCheckConfigConfig.cmake"
+        filename: "ParameterCheckConfig\.cps"
+        kind: "cps"
+      -
+        filename: "parametercheckconfig\.cps"
+        kind: "cps"
+      -
+        filename: "ParameterCheckConfigConfig\.cmake"
         kind: "cmake"
       -
-        filename: "parametercheckconfig-config.cmake"
+        filename: "parametercheckconfig-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -50,33 +56,65 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake"
       mode: "config"
-      version: "1.6"
+      version: "1\.6"
     search_context:(
       [^
 ]*)+
@@ -87,10 +125,16 @@ events:(
     name: "ParameterCheckConfig"
     configs:
       -
-        filename: "ParameterCheckConfigConfig.cmake"
+        filename: "ParameterCheckConfig\.cps"
+        kind: "cps"
+      -
+        filename: "parametercheckconfig\.cps"
+        kind: "cps"
+      -
+        filename: "ParameterCheckConfigConfig\.cmake"
         kind: "cmake"
       -
-        filename: "parametercheckconfig-config.cmake"
+        filename: "parametercheckconfig-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -118,81 +162,177 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/suffix1/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/suffix1/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/suffix1/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/suffix1/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/suffix2/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/suffix2/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/suffix2/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/suffix2/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/suffix1/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/suffix1/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/suffix2/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/suffix2/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/suffix1/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/suffix1/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/suffix2/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/suffix2/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/suffix1/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/suffix1/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/suffix1/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/suffix1/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/suffix2/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/suffix2/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/suffix2/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/suffix2/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/suffix1/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/suffix1/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/suffix1/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/suffix1/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/suffix2/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/suffix2/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/suffix2/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/suffix2/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/suffix1/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/suffix1/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/suffix2/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/suffix2/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/suffix1/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/suffix1/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/suffix2/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/suffix2/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake"
       mode: "config"
-      version: "1.6"
+      version: "1\.6"
     search_context:(
       [^
 ]*)+
@@ -203,10 +343,16 @@ events:(
     name: "ParameterCheckConfig"
     configs:
       -
-        filename: "ParameterCheckConfigConfig.cmake"
+        filename: "ParameterCheckConfig\.cps"
+        kind: "cps"
+      -
+        filename: "parametercheckconfig\.cps"
+        kind: "cps"
+      -
+        filename: "ParameterCheckConfigConfig\.cmake"
         kind: "cmake"
       -
-        filename: "parametercheckconfig-config.cmake"
+        filename: "parametercheckconfig-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -232,13 +378,29 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
     found: null
     search_context:(
       [^
@@ -250,10 +412,16 @@ events:(
     name: "ParameterCheckConfig"
     configs:
       -
-        filename: "ParameterCheckConfigConfig.cmake"
+        filename: "ParameterCheckConfig\.cps"
+        kind: "cps"
+      -
+        filename: "parametercheckconfig\.cps"
+        kind: "cps"
+      -
+        filename: "ParameterCheckConfigConfig\.cmake"
         kind: "cmake"
       -
-        filename: "parametercheckconfig-config.cmake"
+        filename: "parametercheckconfig-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -279,33 +447,65 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake"
       mode: "config"
-      version: "1.6"
+      version: "1\.6"
     search_context:(
       [^
 ]*)+
@@ -316,10 +516,16 @@ events:(
     name: "ParameterCheckConfig"
     configs:
       -
-        filename: "ParameterCheckConfigConfig.cmake"
+        filename: "ParameterCheckConfig\.cps"
+        kind: "cps"
+      -
+        filename: "parametercheckconfig\.cps"
+        kind: "cps"
+      -
+        filename: "ParameterCheckConfigConfig\.cmake"
         kind: "cmake"
       -
-        filename: "parametercheckconfig-config.cmake"
+        filename: "parametercheckconfig-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -345,33 +551,65 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "ONLY"
     candidates:
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake"
       mode: "config"
-      version: "1.6"
+      version: "1\.6"
     search_context:(
       [^
 ]*)+
@@ -382,10 +620,16 @@ events:(
     name: "ParameterCheckConfig"
     configs:
       -
-        filename: "ParameterCheckConfigConfig.cmake"
+        filename: "ParameterCheckConfig\.cps"
+        kind: "cps"
+      -
+        filename: "parametercheckconfig\.cps"
+        kind: "cps"
+      -
+        filename: "ParameterCheckConfigConfig\.cmake"
         kind: "cmake"
       -
-        filename: "parametercheckconfig-config.cmake"
+        filename: "parametercheckconfig-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -411,33 +655,65 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "NEVER"
     candidates:
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake"
       mode: "config"
-      version: "1.6"
+      version: "1\.6"
     search_context:(
       [^
 ]*)+
@@ -448,16 +724,28 @@ events:(
     name: "OtherParameterCheck"
     configs:
       -
-        filename: "BogusParameterCheckConfig.cmake"
+        filename: "BogusParameterCheck\.cps"
+        kind: "cps"
+      -
+        filename: "bogusparametercheck\.cps"
+        kind: "cps"
+      -
+        filename: "BogusParameterCheckConfig\.cmake"
         kind: "cmake"
       -
-        filename: "bogusparametercheck-config.cmake"
+        filename: "bogusparametercheck-config\.cmake"
         kind: "cmake"
       -
-        filename: "ParameterCheckConfigConfig.cmake"
+        filename: "ParameterCheckConfig\.cps"
+        kind: "cps"
+      -
+        filename: "parametercheckconfig\.cps"
+        kind: "cps"
+      -
+        filename: "ParameterCheckConfigConfig\.cmake"
         kind: "cmake"
       -
-        filename: "parametercheckconfig-config.cmake"
+        filename: "parametercheckconfig-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -484,65 +772,129 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/BogusParameterCheckConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/BogusParameterCheckConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/bogusparametercheck-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/bogusparametercheck-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/BogusParameterCheckConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/BogusParameterCheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/bogusparametercheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/BogusParameterCheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/bogusparametercheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/BogusParameterCheckConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/bogusparametercheck-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/bogusparametercheck-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/BogusParameterCheckConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/BogusParameterCheckConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/bogusparametercheck-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/bogusparametercheck-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/ParameterCheckConfigConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/BogusParameterCheckConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/BogusParameterCheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/bogusparametercheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/BogusParameterCheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/bogusparametercheck\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/BogusParameterCheckConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/bogusparametercheck-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/bogusparametercheck-config\.cmake"
         mode: "config"
         reason: "no_exist"
     found:
-      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake"
       mode: "config"
-      version: "1.6"
+      version: "1\.6"
     search_context:(
       [^
 ]*)+

Tests/RunCMake/find_package/ConfigureLogParameters2-stderr.txt

@@ -68,6 +68,14 @@
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig\.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig\.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig\.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig\.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake
@@ -76,6 +84,14 @@
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig\.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig\.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig\.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig\.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake
 
   The file was found at
@@ -164,6 +180,30 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/suffix2/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/suffix1/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/suffix1/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/suffix2/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/suffix2/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/suffix1/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/suffix1/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/suffix2/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/suffix2/parametercheckconfig.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake
@@ -188,6 +228,30 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/cmake/suffix2/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/suffix1/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/suffix1/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/suffix2/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/suffix2/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/suffix1/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/suffix1/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/suffix2/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/suffix2/parametercheckconfig.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake
 
   The file was found at
@@ -220,6 +284,14 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
 ]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig\.cmake
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig.cps
 
   The file was not found\.
 
@@ -296,6 +368,14 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake
@@ -304,6 +384,14 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake
 
   The file was found at
@@ -384,6 +472,14 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake
@@ -392,6 +488,14 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake
 
   The file was found at
@@ -472,6 +576,14 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/ParameterCheckConfigConfig\.cmake
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/parametercheckconfig-config\.cmake
@@ -480,6 +592,14 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/ParameterCheckConfigConfig\.cmake
 
   The file was found at
@@ -564,6 +684,22 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/BogusParameterCheck.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/bogusparametercheck.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/BogusParameterCheck.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/bogusparametercheck.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLogParameters2-build/CMakeFiles/pkgRedirects/share/cps/parametercheckconfig.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/BogusParameterCheckConfig\.cmake
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/bogusparametercheck-config\.cmake
@@ -580,6 +716,22 @@ CMake Debug Log at ConfigureLogParameters2\.cmake:[0-9]+ \(find_package\):
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/cmake/parametercheckconfig-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/BogusParameterCheck.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/bogusparametercheck.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/lib/cps/parametercheckconfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/BogusParameterCheck.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/bogusparametercheck.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/ParameterCheckConfig.cps
+    [^
+]*/Tests/RunCMake/find_package/ConfigureLog/share/cps/parametercheckconfig.cps
+    [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/BogusParameterCheckConfig\.cmake
     [^
 ]*/Tests/RunCMake/find_package/ConfigureLog/lib/cmake/ParameterCheckConfig/bogusparametercheck-config\.cmake

Tests/RunCMake/find_package/ConfigureLogTransitionsConfig2-stderr.txt

@@ -7,6 +7,8 @@ CMake Warning at ConfigureLogTransitionsConfig2\.cmake:[0-9]+ \(find_package\):
   Could not find a package configuration file provided by "ViaConfig" with
   any of the following names:
 
+    ViaConfig\.cps
+    viaconfig\.cps
     ViaConfigConfig\.cmake
     viaconfig-config\.cmake
 
@@ -27,6 +29,8 @@ CMake Warning at ConfigureLogTransitionsConfig2\.cmake:[0-9]+ \(find_package\):
   Could not find a package configuration file provided by "ViaConfig" with
   any of the following names:
 
+    ViaConfig\.cps
+    viaconfig\.cps
     ViaConfigConfig\.cmake
     viaconfig-config\.cmake
 
@@ -49,6 +53,8 @@ CMake Warning at ConfigureLogTransitionsConfig2\.cmake:[0-9]+ \(find_package\):
   Could not find a package configuration file provided by "ViaConfig" with
   any of the following names:
 
+    ViaConfig\.cps
+    viaconfig\.cps
     ViaConfigConfig\.cmake
     viaconfig-config\.cmake
 

Tests/RunCMake/find_package/ConfigureLogTransitionsConfig2Suppressed-stderr.txt

@@ -7,6 +7,8 @@ CMake Warning at ConfigureLogTransitionsConfig2Suppressed\.cmake:[0-9]+ \(find_p
   Could not find a package configuration file provided by "ViaConfig" with
   any of the following names:
 
+    ViaConfig\.cps
+    viaconfig\.cps
     ViaConfigConfig\.cmake
     viaconfig-config\.cmake
 
@@ -27,6 +29,8 @@ CMake Warning at ConfigureLogTransitionsConfig2Suppressed\.cmake:[0-9]+ \(find_p
   Could not find a package configuration file provided by "ViaConfig" with
   any of the following names:
 
+    ViaConfig\.cps
+    viaconfig\.cps
     ViaConfigConfig\.cmake
     viaconfig-config\.cmake
 
@@ -49,6 +53,8 @@ CMake Warning at ConfigureLogTransitionsConfig2Suppressed\.cmake:[0-9]+ \(find_p
   Could not find a package configuration file provided by "ViaConfig" with
   any of the following names:
 
+    ViaConfig\.cps
+    viaconfig\.cps
     ViaConfigConfig\.cmake
     viaconfig-config\.cmake
 

Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-config.txt

@@ -27,10 +27,16 @@ events:(
     name: "ViaModule"
     configs:
       -
-        filename: "ViaModuleConfig.cmake"
+        filename: "ViaModule\.cps"
+        kind: "cps"
+      -
+        filename: "viamodule\.cps"
+        kind: "cps"
+      -
+        filename: "ViaModuleConfig\.cmake"
         kind: "cmake"
       -
-        filename: "viamodule-config.cmake"
+        filename: "viamodule-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -56,16 +62,32 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/ViaModuleConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/ViaModuleConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/viamodule-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/viamodule-config\.cmake"
         mode: "config"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/lib/cps/ViaModule\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/lib/cps/viamodule\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/share/cps/ViaModule\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/share/cps/viamodule\.cps"
+        mode: "cps"
         reason: "no_exist"(
       -
-        path: "[^"]*/(viamodule-config|ViaModuleConfig).cmake"
-        mode: "config"
+        path: "[^"]*/((viamodule|ViaModule)\.cps|(viamodule-config|ViaModuleConfig)\.cmake)"
+        mode: "(cps|config)"
         reason: "no_exist")*
     found: null
     search_context:(
@@ -107,10 +129,16 @@ events:(
     name: "ViaModule"
     configs:
       -
-        filename: "ViaModuleConfig.cmake"
+        filename: "ViaModule\.cps"
+        kind: "cps"
+      -
+        filename: "viamodule\.cps"
+        kind: "cps"
+      -
+        filename: "ViaModuleConfig\.cmake"
         kind: "cmake"
       -
-        filename: "viamodule-config.cmake"
+        filename: "viamodule-config\.cmake"
         kind: "cmake"
     version_request:
       exact: false
@@ -136,16 +164,32 @@ events:(
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/ViaModuleConfig.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/ViaModuleConfig\.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/viamodule-config.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/viamodule-config\.cmake"
         mode: "config"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/lib/cps/ViaModule\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/lib/cps/viamodule\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/share/cps/ViaModule\.cps"
+        mode: "cps"
+        reason: "no_exist"
+      -
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-build/CMakeFiles/pkgRedirects/share/cps/viamodule\.cps"
+        mode: "cps"
         reason: "no_exist"(
       -
-        path: "[^"]*/(viamodule-config|ViaModuleConfig).cmake"
-        mode: "config"
+        path: "[^"]*/((viamodule|ViaModule)\.cps|(viamodule-config|ViaModuleConfig)\.cmake)"
+        mode: "(cps|config)"
         reason: "no_exist")*
     found: null
     search_context:(

Tests/RunCMake/find_package/ConfigureLogTransitionsModule2-stderr.txt

@@ -7,6 +7,8 @@ CMake Warning at ConfigureLogTransitionsModule2\.cmake:[0-9]+ \(find_package\):
   Could not find a package configuration file provided by "ViaModule" with
   any of the following names:
 
+    ViaModule\.cps
+    viamodule\.cps
     ViaModuleConfig\.cmake
     viamodule-config\.cmake
 
@@ -27,6 +29,8 @@ CMake Warning at ConfigureLogTransitionsModule2\.cmake:[0-9]+ \(find_package\):
   Could not find a package configuration file provided by "ViaModule" with
   any of the following names:
 
+    ViaModule\.cps
+    viamodule\.cps
     ViaModuleConfig\.cmake
     viamodule-config\.cmake
 
@@ -49,6 +53,8 @@ CMake Warning at ConfigureLogTransitionsModule2\.cmake:[0-9]+ \(find_package\):
   Could not find a package configuration file provided by "ViaModule" with
   any of the following names:
 
+    ViaModule\.cps
+    viamodule\.cps
     ViaModuleConfig\.cmake
     viamodule-config\.cmake
 

Tests/RunCMake/find_package/ConfigureLogTransitionsModule2Suppressed-stderr.txt

@@ -7,6 +7,8 @@ CMake Warning at ConfigureLogTransitionsModule2Suppressed\.cmake:[0-9]+ \(find_p
   Could not find a package configuration file provided by "ViaModule" with
   any of the following names:
 
+    ViaModule\.cps
+    viamodule\.cps
     ViaModuleConfig\.cmake
     viamodule-config\.cmake
 
@@ -27,6 +29,8 @@ CMake Warning at ConfigureLogTransitionsModule2Suppressed\.cmake:[0-9]+ \(find_p
   Could not find a package configuration file provided by "ViaModule" with
   any of the following names:
 
+    ViaModule\.cps
+    viamodule\.cps
     ViaModuleConfig\.cmake
     viamodule-config\.cmake
 
@@ -49,6 +53,8 @@ CMake Warning at ConfigureLogTransitionsModule2Suppressed\.cmake:[0-9]+ \(find_p
   Could not find a package configuration file provided by "ViaModule" with
   any of the following names:
 
+    ViaModule\.cps
+    viamodule\.cps
     ViaModuleConfig\.cmake
     viamodule-config\.cmake
 

Tests/RunCMake/find_package/DebugRoot-stderr.txt

@@ -41,6 +41,14 @@
     [^
 ]*/Tests/RunCMake/find_package/DebugRoot/NoExist/DebugRoot/debugroot-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/DebugRoot/NoExist/DebugRoot/lib/cps/DebugRoot\.cps
+    [^
+]*/Tests/RunCMake/find_package/DebugRoot/NoExist/DebugRoot/lib/cps/debugroot\.cps
+    [^
+]*/Tests/RunCMake/find_package/DebugRoot/NoExist/DebugRoot/share/cps/DebugRoot\.cps
+    [^
+]*/Tests/RunCMake/find_package/DebugRoot/NoExist/DebugRoot/share/cps/debugroot\.cps
+    [^
 ]*/Tests/RunCMake/find_package/DebugRoot/Exist/DebugRoot/DebugRootConfig\.cmake
 
   The file was found at

Tests/RunCMake/find_package/FromPATHEnv-stderr.txt

@@ -78,6 +78,14 @@
     [^
 ]*/Tests/RunCMake/find_package/FromPATHEnv-build/CMakeFiles/pkgRedirects/resolved-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/FromPATHEnv-build/CMakeFiles/pkgRedirects/lib/cps/Resolved\.cps
+    [^
+]*/Tests/RunCMake/find_package/FromPATHEnv-build/CMakeFiles/pkgRedirects/lib/cps/resolved\.cps
+    [^
+]*/Tests/RunCMake/find_package/FromPATHEnv-build/CMakeFiles/pkgRedirects/share/cps/Resolved\.cps
+    [^
+]*/Tests/RunCMake/find_package/FromPATHEnv-build/CMakeFiles/pkgRedirects/share/cps/resolved\.cps
+    [^
 ]*/Tests/RunCMake/find_package/PackageRoot/ResolvedConfig\.cmake
 
   The file was found at

Tests/RunCMake/find_package/FromPATHEnvDebugPkg-stderr.txt

@@ -78,6 +78,14 @@
     [^
 ]*/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-build/CMakeFiles/pkgRedirects/resolved-config\.cmake
     [^
+]*/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-build/CMakeFiles/pkgRedirects/lib/cps/Resolved\.cps
+    [^
+]*/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-build/CMakeFiles/pkgRedirects/lib/cps/resolved\.cps
+    [^
+]*/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-build/CMakeFiles/pkgRedirects/share/cps/Resolved\.cps
+    [^
+]*/Tests/RunCMake/find_package/FromPATHEnvDebugPkg-build/CMakeFiles/pkgRedirects/share/cps/resolved\.cps
+    [^
 ]*/Tests/RunCMake/find_package/PackageRoot/ResolvedConfig\.cmake
 
   The file was found at

Tests/RunCMake/find_package/MissingConfigRequired-stderr.txt

@@ -2,6 +2,8 @@ CMake Error at MissingConfigRequired\.cmake:1 \(find_package\):
   Could not find a package configuration file provided by "NotHere" with any
   of the following names:
 
+    NotHere\.cps
+    nothere\.cps
     NotHereConfig\.cmake
     nothere-config\.cmake
 

Tests/RunCMake/find_package/MissingNormal-stderr.txt

@@ -6,6 +6,8 @@ CMake Warning at MissingNormal\.cmake:1 \(find_package\):
   Could not find a package configuration file provided by "NotHere" with any
   of the following names:
 
+    NotHere\.cps
+    nothere\.cps
     NotHereConfig\.cmake
     nothere-config\.cmake
 

Tests/RunCMake/find_package/MissingNormalRequired-stderr.txt

@@ -6,6 +6,8 @@ CMake Error at MissingNormalRequired\.cmake:1 \(find_package\):
   Could not find a package configuration file provided by "NotHere" with any
   of the following names:
 
+    NotHere\.cps
+    nothere\.cps
     NotHereConfig\.cmake
     nothere-config\.cmake
 

Tests/RunCMake/find_package/MissingNormalVersion-stderr.txt

@@ -6,6 +6,8 @@ CMake Warning at MissingNormalVersion\.cmake:1 \(find_package\):
   Could not find a package configuration file provided by "NotHere"
   \(requested version 1\.2\) with any of the following names:
 
+    NotHere\.cps
+    nothere\.cps
     NotHereConfig\.cmake
     nothere-config\.cmake
 

Tests/RunCMake/find_package/MissingNormalWarnNoModuleNew-stderr.txt

@@ -19,6 +19,8 @@ CMake Warning at MissingNormalWarnNoModuleNew\.cmake:3 \(find_package\):
   Could not find a package configuration file provided by "NotHere" with any
   of the following names:
 
+    NotHere\.cps
+    nothere\.cps
     NotHereConfig\.cmake
     nothere-config\.cmake
 

Tests/RunCMake/find_package/MissingNormalWarnNoModuleOld-stderr.txt

@@ -19,6 +19,8 @@ CMake Warning at MissingNormalWarnNoModuleOld\.cmake:2 \(find_package\):
   Could not find a package configuration file provided by "NotHere" with any
   of the following names:
 
+    NotHere\.cps
+    nothere\.cps
     NotHereConfig\.cmake
     nothere-config\.cmake
 

Tests/RunCMake/find_package/ModuleModeDebugPkg-stderr.txt

@@ -116,6 +116,14 @@ CMake Debug Log at ModuleModeDebugPkg/FindFoo\.cmake:[0-9]+ \(find_package\):
 ]*/Tests/RunCMake/find_package/ModuleModeDebugPkg-build/CMakeFiles/pkgRedirects/ZotConfig\.cmake
     [^
 ]*/Tests/RunCMake/find_package/ModuleModeDebugPkg-build/CMakeFiles/pkgRedirects/zot-config\.cmake
+    [^
+]*/Tests/RunCMake/find_package/ModuleModeDebugPkg-build/CMakeFiles/pkgRedirects/lib/cps/Zot\.cps
+    [^
+]*/Tests/RunCMake/find_package/ModuleModeDebugPkg-build/CMakeFiles/pkgRedirects/lib/cps/zot\.cps
+    [^
+]*/Tests/RunCMake/find_package/ModuleModeDebugPkg-build/CMakeFiles/pkgRedirects/share/cps/Zot\.cps
+    [^
+]*/Tests/RunCMake/find_package/ModuleModeDebugPkg-build/CMakeFiles/pkgRedirects/share/cps/zot\.cps
 
   The file was not found\.
 

Tests/RunCMake/find_package/PackageVarOverridesOptional-stderr.txt

@@ -6,6 +6,8 @@ CMake Error at PackageVarOverridesOptional\.cmake:[0-9]+ \(find_package\):
   Could not find a package configuration file provided by "Foo" with any of
   the following names:
 
+    Foo\.cps
+    foo\.cps
     FooConfig\.cmake
     foo-config\.cmake
 

Tests/RunCMake/find_package/RequiredVarNested-stderr.txt

@@ -6,6 +6,8 @@ CMake Warning at RequiredVarNestedConfig\.cmake:[0-9]+ \(find_package\):
   Could not find a package configuration file provided by "DoesNotExist" with
   any of the following names:
 
+    DoesNotExist\.cps
+    doesnotexist\.cps
     DoesNotExistConfig\.cmake
     doesnotexist-config\.cmake
 

Tests/RunCMake/find_package/RequiredVarOptional-stderr.txt

@@ -6,6 +6,8 @@ CMake Error at RequiredVarOptional\.cmake:[0-9]+ \(find_package\):
   Could not find a package configuration file provided by "DoesNotExist" with
   any of the following names:
 
+    DoesNotExist\.cps
+    doesnotexist\.cps
     DoesNotExistConfig\.cmake
     doesnotexist-config\.cmake
 

Tests/RunCMake/find_package/UnwindIncludeBlock-stderr.txt

@@ -6,6 +6,7 @@ CMake Warning at UnwindInclude/UnwindBlock\.cmake:4 \(find_package\):
   Could not find a package configuration file provided by "foo" with any of
   the following names:
 
+    foo\.cps
     fooConfig\.cmake
     foo-config\.cmake
 

Tests/RunCMake/find_package/UnwindIncludeFunction-stderr.txt

@@ -6,6 +6,7 @@ CMake Warning at UnwindInclude/UnwindFunction\.cmake:4 \(find_package\):
   Could not find a package configuration file provided by "foo" with any of
   the following names:
 
+    foo\.cps
     fooConfig\.cmake
     foo-config\.cmake
 

Tests/RunCMake/find_package/UnwindIncludeInvalidFindPackage-stderr.txt

@@ -6,6 +6,7 @@ CMake Warning at UnwindInclude/UnwindInvalidFindPackage\.cmake:1 \(find_package\
   Could not find a package configuration file provided by "foo" with any of
   the following names:
 
+    foo\.cps
     fooConfig\.cmake
     foo-config\.cmake
 

Tests/RunCMake/find_package/UnwindIncludeInvalidInclude-stderr.txt

@@ -6,6 +6,7 @@ CMake Warning at UnwindInclude/UnwindInvalidInclude\.cmake:1 \(find_package\):
   Could not find a package configuration file provided by "foo" with any of
   the following names:
 
+    foo\.cps
     fooConfig\.cmake
     foo-config\.cmake
 

Tests/RunCMake/find_package/UnwindIncludeOnly-stderr.txt

@@ -6,6 +6,7 @@ CMake Warning at UnwindInclude/UnwindOnly\.cmake:1 \(find_package\):
   Could not find a package configuration file provided by "foo" with any of
   the following names:
 
+    foo\.cps
     fooConfig\.cmake
     foo-config\.cmake
 

Tests/RunCMake/no_install_prefix/no_install_prefix-stderr.txt

@@ -6,6 +6,8 @@ CMake Error at do_test\.cmake:16 \(find_package\):
   Could not find a package configuration file provided by "NoPrefix" with any
   of the following names:
 
+    NoPrefix\.cps
+    noprefix\.cps
     NoPrefixConfig\.cmake
     noprefix-config\.cmake
 

Tests/RunCMake/project/KeywordProjectName-stderr.txt

@@ -14,6 +14,22 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 
+CMake Warning \(dev\) at KeywordProjectName\.cmake:[0-9]+ \(project\):
+  project\(\) called with 'COMPAT_VERSION' as first argument\.  The first
+  parameter should be the project name, not a keyword argument\.  See the
+  cmake-commands\(7\) manual for correct usage of the project\(\) command\.
+Call Stack \(most recent call first\):
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
+
+CMake Warning \(dev\) at KeywordProjectName\.cmake:[0-9]+ \(project\):
+  project\(\) called with 'SPDX_LICENSE' as first argument\.  The first
+  parameter should be the project name, not a keyword argument\.  See the
+  cmake-commands\(7\) manual for correct usage of the project\(\) command\.
+Call Stack \(most recent call first\):
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
+
 CMake Warning \(dev\) at KeywordProjectName\.cmake:[0-9]+ \(project\):
   project\(\) called with 'DESCRIPTION' as first argument\.  The first parameter
   should be the project name, not a keyword argument\.  See the