cmFindCommon: always track configure log information

This does mean that debug state is always around, so instead gate the
non-configure log information behind a dedicated variable.

Source/cmFindCommon.cxx

@@ -47,6 +47,7 @@ cmFindCommon::cmFindCommon(cmExecutionStatus& status)
   , Status(status)
 {
   this->FindRootPathMode = RootPathModeBoth;
+  this->FullDebugMode = false;
   this->NoDefaultPath = false;
   this->NoPackageRootPath = false;
   this->NoCMakePath = false;
@@ -92,7 +93,7 @@ void cmFindCommon::SetError(std::string const& e)
 
 bool cmFindCommon::DebugModeEnabled() const
 {
-  return static_cast<bool>(this->DebugState);
+  return this->FullDebugMode;
 }
 
 void cmFindCommon::DebugMessage(std::string const& msg) const
@@ -508,22 +509,27 @@ void cmFindCommonDebugState::FailedAt(std::string const& path,
 
 void cmFindCommonDebugState::Write()
 {
+  auto const* const fc = this->FindCommand;
+
 #ifndef CMAKE_BOOTSTRAP
   // Write find event to the configure log if the log exists
   if (cmConfigureLog* log =
-        this->FindCommand->Makefile->GetCMakeInstance()->GetConfigureLog()) {
+        fc->Makefile->GetCMakeInstance()->GetConfigureLog()) {
     // Write event if any of:
+    //   - debug mode is enabled
     //   - the variable was not defined (first run)
     //   - the variable found state does not match the new found state (state
     //     transition)
-    if (!this->FindCommand->IsDefined() ||
-        this->FindCommand->IsFound() != this->IsFound) {
-      this->WriteEvent(*log, *this->FindCommand->Makefile);
+    if (fc->DebugModeEnabled() || !fc->IsDefined() ||
+        fc->IsFound() != this->IsFound) {
+      this->WriteEvent(*log, *fc->Makefile);
     }
   }
 #endif
 
-  this->WriteDebug();
+  if (fc->DebugModeEnabled()) {
+    this->WriteDebug();
+  }
 }
 
 #ifndef CMAKE_BOOTSTRAP

Source/cmFindCommon.h

@@ -136,6 +136,7 @@ protected:
   void AddPathSuffix(std::string const& arg);
 
   void DebugMessage(std::string const& msg) const;
+  bool FullDebugMode;
   std::unique_ptr<cmFindCommonDebugState> DebugState;
   bool NoDefaultPath;
   bool NoPackageRootPath;

Source/cmFindLibraryCommand.cxx

@@ -44,9 +44,8 @@ bool cmFindLibraryCommand::InitialPass(std::vector<std::string> const& argsIn)
     return false;
   }
 
-  if (this->ComputeIfDebugModeWanted(this->VariableName)) {
-    this->DebugState = cm::make_unique<cmFindBaseDebugState>(this);
-  }
+  this->DebugState = cm::make_unique<cmFindBaseDebugState>(this);
+  this->FullDebugMode = this->ComputeIfDebugModeWanted(this->VariableName);
 
   if (this->IsFound()) {
     this->NormalizeFindResult();

Source/cmFindPackageCommand.cxx

@@ -728,9 +728,8 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
 
   // Process debug mode
   cmMakefile::DebugFindPkgRAII debugFindPkgRAII(this->Makefile, this->Name);
-  if (this->ComputeIfDebugModeWanted()) {
-    this->DebugState = cm::make_unique<cmFindPackageDebugState>(this);
-  }
+  this->DebugState = cm::make_unique<cmFindPackageDebugState>(this);
+  this->FullDebugMode = this->ComputeIfDebugModeWanted();
 
   // Parse the arguments.
   enum Doing

Source/cmFindPathCommand.cxx

@@ -38,9 +38,8 @@ bool cmFindPathCommand::InitialPass(std::vector<std::string> const& argsIn)
     return false;
   }
 
-  if (this->ComputeIfDebugModeWanted(this->VariableName)) {
-    this->DebugState = cm::make_unique<cmFindBaseDebugState>(this);
-  }
+  this->DebugState = cm::make_unique<cmFindBaseDebugState>(this);
+  this->FullDebugMode = this->ComputeIfDebugModeWanted(this->VariableName);
 
   if (this->IsFound()) {
     this->NormalizeFindResult();

Source/cmFindProgramCommand.cxx

@@ -199,9 +199,8 @@ bool cmFindProgramCommand::InitialPass(std::vector<std::string> const& argsIn)
   if (!this->ParseArguments(argsIn)) {
     return false;
   }
-  if (this->ComputeIfDebugModeWanted(this->VariableName)) {
-    this->DebugState = cm::make_unique<cmFindBaseDebugState>(this);
-  }
+  this->DebugState = cm::make_unique<cmFindBaseDebugState>(this);
+  this->FullDebugMode = this->ComputeIfDebugModeWanted(this->VariableName);
 
   if (this->IsFound()) {
     this->NormalizeFindResult();

Tests/RunCMake/find_package/ConfigureLog-config.txt

@@ -1,13 +1,17 @@
 ^
 ---
-events:
+events:(
   -
+    kind: "find-v1"(
+    [^
+]*)+|
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+
     message: \|(
 +      [^
-]*)*
+]*)*)*
   -
     kind: "find_package-v1"
     backtrace:(
@@ -44,31 +48,31 @@ 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/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"
     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:(
@@ -100,7 +104,7 @@ 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"
     search_context:(
@@ -142,31 +146,31 @@ 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/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"
     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"
     search_context:(
@@ -198,7 +202,7 @@ 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"
     search_context:(
@@ -242,39 +246,39 @@ 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/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/cmake/VersionCheck-1.5/VersionCheckConfig.cmake"
         mode: "config"
         reason: "insufficient_version"
       -
-        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"
     search_context:(

Tests/RunCMake/find_package/ConfigureLogParameters1-config.txt

@@ -1,13 +1,17 @@
 ^
 ---
-events:
+events:(
   -
+    kind: "find-v1"(
+    [^
+]*)+|
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+
     message: \|(
 +      [^
-]*)*
+]*)*)*
   -
     kind: "find_package-v1"
     backtrace:(
@@ -37,7 +41,7 @@ events:
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: ".*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
+        path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
         mode: "module"
         reason: "not_found"
         message: "Not an EXACT version match"
@@ -75,7 +79,7 @@ events:
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: ".*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
       mode: "module"
       version: "1.2"
     search_context:(
@@ -109,7 +113,7 @@ events:
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: ".*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
       mode: "module"
       version: "1.2"
     search_context:(
@@ -141,7 +145,7 @@ events:
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: ".*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
       mode: "module"
       version: "1.2"
     search_context:(
@@ -173,7 +177,7 @@ events:
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: ".*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
       mode: "module"
       version: "1.2"
     search_context:(
@@ -214,7 +218,7 @@ events:
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: ".*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
       mode: "module"
       version: "1.2"
     search_context:(
@@ -247,7 +251,7 @@ events:
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: ".*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
       mode: "module"
       version: "1.2"
     search_context:(
@@ -279,7 +283,7 @@ events:
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: ".*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
       mode: "module"
       version: "1.2"
     search_context:(
@@ -311,7 +315,7 @@ events:
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: ".*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
       mode: "module"
       version: "1.2"
     search_context:(
@@ -343,7 +347,7 @@ events:
         CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY: true
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     found:
-      path: ".*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
+      path: "[^"]*/Tests/RunCMake/find_package/ConfigureLog/cmake/FindParameterCheck.cmake"
       mode: "module"
       version: "1.2"
     search_context:(

Tests/RunCMake/find_package/ConfigureLogParameters2-config.txt

@@ -1,13 +1,17 @@
 ^
 ---
-events:
+events:(
   -
+    kind: "find-v1"(
+    [^
+]*)+|
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+
     message: \|(
 +      [^
-]*)*
+]*)*)*
   -
     kind: "find_package-v1"
     backtrace:(
@@ -29,7 +33,7 @@ events:
       policy_scope: true
       bypass_provider: false
       hints:
-        - ".*/Tests/RunCMake/find_package"
+        - "[^"]*/Tests/RunCMake/find_package"
       names:
         - "ParameterCheckConfig"
       path_suffixes:
@@ -46,31 +50,31 @@ events:
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: ".*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-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/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"
     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"
     search_context:(
@@ -114,79 +118,79 @@ events:
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: ".*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/suffix1/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/suffix1/ParameterCheckConfigConfig.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/suffix1/parametercheckconfig-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/suffix1/parametercheckconfig-config.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/suffix2/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/suffix2/ParameterCheckConfigConfig.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/suffix2/parametercheckconfig-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/suffix2/parametercheckconfig-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/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"
     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"
     search_context:(
@@ -228,11 +232,11 @@ events:
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: ".*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
         mode: "config"
         reason: "no_exist"
     found: null
@@ -275,31 +279,31 @@ events:
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: ".*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-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/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"
     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"
     search_context:(
@@ -341,31 +345,31 @@ events:
         CMAKE_FIND_ROOT_PATH_MODE: "ONLY"
     candidates:
       -
-        path: ".*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-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/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"
     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"
     search_context:(
@@ -407,31 +411,31 @@ events:
         CMAKE_FIND_ROOT_PATH_MODE: "NEVER"
     candidates:
       -
-        path: ".*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-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/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"
     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"
     search_context:(
@@ -480,63 +484,63 @@ events:
         CMAKE_FIND_ROOT_PATH_MODE: "BOTH"
     candidates:
       -
-        path: ".*/CMakeFiles/pkgRedirects/BogusParameterCheckConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/BogusParameterCheckConfig.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/bogusparametercheck-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/bogusparametercheck-config.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/ParameterCheckConfigConfig.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
+        path: "[^"]*/CMakeFiles/pkgRedirects/parametercheckconfig-config.cmake"
         mode: "config"
         reason: "no_exist"
       -
-        path: ".*/Tests/RunCMake/find_package/ConfigureLog/BogusParameterCheckConfig.cmake"
+        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/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"
     search_context:(

Tests/RunCMake/try_compile/ConfigureLog-config.txt

@@ -2,28 +2,16 @@
 ---
 events:(
   -
+    kind: "find-v1"(
+    [^
+]*)+|
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+
     message: \|(
 +      [^
-]*)*|
-  -
-    kind: "find-v1"
-    backtrace:(
-      - "[^"]+")+
-    mode: "[^"]*"
-    variable: "[^"]*"
-    description: "[^"]*"
-    settings:(
-      [A-Za-z_]+: (true|false|"(NEVER|ONLY|FIRST|LAST)"))+
-    names:(
-      - "[^"]+")+
-    candidate_directories:(
-      - "[^"]+")*
-    searched_directories:(
-      - "[^"]+")*
-    found: (false|"[^"]*"))+
+]*)*)*
   -
     kind: "try_compile-v1"
     backtrace:
@@ -44,29 +32,17 @@ events:(
       cached: true
       stdout: \|.*
       exitCode: 0(
-  -
++  -
+    kind: "find-v1"(
+    [^
+]*)+|
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+
     message: \|(
 +      [^
-]*)*|
-  -
-    kind: "find-v1"
-    backtrace:(
-      - "[^"]+")+
-    mode: "[^"]*"
-    variable: "[^"]*"
-    description: "[^"]*"
-    settings:(
-      [A-Za-z_]+: (true|false|"(NEVER|ONLY|FIRST|LAST)"))+
-    names:(
-      - "[^"]+")+
-    candidate_directories:(
-      - "[^"]+")*
-    searched_directories:(
-      - "[^"]+")*
-    found: (false|"[^"]*"))+(
+]*)*)+(
   -
     kind: "try_compile-v1"
     backtrace:

Tests/RunCMake/try_compile/Inspect-config.txt

@@ -8,22 +8,10 @@ events:(
     message: \|(
 +      [^
 ]*)*|
-  -
-    kind: "find-v1"
-    backtrace:(
-      - "[^"]+")+
-    mode: "[^"]*"
-    variable: "[^"]*"
-    description: "[^"]*"
-    settings:(
-      [A-Za-z_]+: (true|false|"(NEVER|ONLY|FIRST|LAST)"))+
-    names:(
-      - "[^"]+")+
-    candidate_directories:(
-      - "[^"]+")*
-    searched_directories:(
-      - "[^"]+")*
-    found: (false|"[^"]*"))+
++  -
+    kind: "find-v1"(
+    [^
+]*)+)*
   -
     kind: "try_compile-v1"
     backtrace:
@@ -44,29 +32,17 @@ events:(
       cached: true
       stdout: \|.*
       exitCode: 0(
-  -
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+
     message: \|(
 +      [^
 ]*)*|
-  -
-    kind: "find-v1"
-    backtrace:(
-      - "[^"]+")+
-    mode: "[^"]*"
-    variable: "[^"]*"
-    description: "[^"]*"
-    settings:(
-      [A-Za-z_]+: (true|false|"(NEVER|ONLY|FIRST|LAST)"))+
-    names:(
-      - "[^"]+")+
-    candidate_directories:(
-      - "[^"]+")*
-    searched_directories:(
-      - "[^"]+")*
-    found: (false|"[^"]*"))+
++  -
+    kind: "find-v1"(
+    [^
+]*)+)*
   -
     kind: "try_compile-v1"
     backtrace:
@@ -87,7 +63,7 @@ events:(
       cached: true
       stdout: \|.*
       exitCode: 0(
-  -
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+

Tests/RunCMake/try_compile/SourceFromBadName-config.txt

@@ -20,8 +20,11 @@ events:(
     names:(
       - "[^"]+")+
     candidate_directories:(
-      - "[^"]+")*
+      - "[^"]+")*(
     searched_directories:(
-      - "[^"]+")*
-    found: (false|"[^"]*"))+
-\.\.\.$
+      - "[^"]+")*)?
+    found: (false|"[^"]*")
+    search_context:(
+      [^
+]*)+)+
++\.\.\.$

Tests/RunCMake/try_compile/TopIncludes-config.txt

@@ -2,28 +2,16 @@
 ---
 events:(
   -
+    kind: "find-v1"(
+    [^
+]*)+|
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+
     message: \|(
 +      [^
-]*)*|
-  -
-    kind: "find-v1"
-    backtrace:(
-      - "[^"]+")+
-    mode: "[^"]*"
-    variable: "[^"]*"
-    description: "[^"]*"
-    settings:(
-      [A-Za-z_]+: (true|false|"(NEVER|ONLY|FIRST|LAST)"))+
-    names:(
-      - "[^"]+")+
-    candidate_directories:(
-      - "[^"]+")*
-    searched_directories:(
-      - "[^"]+")*
-    found: (false|"[^"]*"))+
+]*)*)*
   -
     kind: "try_compile-v1"
     backtrace:
@@ -44,29 +32,17 @@ events:(
       cached: true
       stdout: \|.*
       exitCode: 0(
-  -
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+
     message: \|(
 +      [^
 ]*)*|
-  -
-    kind: "find-v1"
-    backtrace:(
-      - "[^"]+")+
-    mode: "[^"]*"
-    variable: "[^"]*"
-    description: "[^"]*"
-    settings:(
-      [A-Za-z_]+: (true|false|"(NEVER|ONLY|FIRST|LAST)"))+
-    names:(
-      - "[^"]+")+
-    candidate_directories:(
-      - "[^"]+")*
-    searched_directories:(
-      - "[^"]+")*
-    found: (false|"[^"]*"))*
++  -
+    kind: "find-v1"(
+    [^
+]*)+)*
   -
     kind: "try_compile-v1"
     backtrace:

Tests/RunCMake/try_run/ConfigureLog-config.txt

@@ -2,28 +2,16 @@
 ---
 events:(
   -
+    kind: "find-v1"(
+    [^
+]*)+|
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+
     message: \|(
 +      [^
-]*)*|
-  -
-    kind: "find-v1"
-    backtrace:(
-      - "[^"]+")+
-    mode: "[^"]*"
-    variable: "[^"]*"
-    description: "[^"]*"
-    settings:(
-      [A-Za-z_]+: (true|false|"(NEVER|ONLY|FIRST|LAST)"))+
-    names:(
-      - "[^"]+")+
-    candidate_directories:(
-      - "[^"]+")*
-    searched_directories:(
-      - "[^"]+")*
-    found: (false|"[^"]*"))+
+]*)*)*
   -
     kind: "try_compile-v1"
     backtrace:
@@ -43,29 +31,17 @@ events:(
       cached: true
       stdout: \|.*
       exitCode: 0(
-  -
++  -
+    kind: "find-v1"(
+    [^
+]*)+|
++  -
     kind: "message-v1"
     backtrace:(
       - "[^"]+")+
     message: \|(
 +      [^
-]*)*|
-  -
-    kind: "find-v1"
-    backtrace:(
-      - "[^"]+")+
-    mode: "[^"]*"
-    variable: "[^"]*"
-    description: "[^"]*"
-    settings:(
-      [A-Za-z_]+: (true|false|"(NEVER|ONLY|FIRST|LAST)"))+
-    names:(
-      - "[^"]+")+
-    candidate_directories:(
-      - "[^"]+")*
-    searched_directories:(
-      - "[^"]+")*
-    found: (false|"[^"]*"))*(
+]*)*)+(
   -
     kind: "try_compile-v1"
     backtrace: