GENERATED prop: Add implementation for policy CMP0118 being set to NEW

* Adding implementation for policy CMP0118 being set to `NEW`.
* Adding new tests for policy CMP0118 being set to `NEW`.
* Checking the `GENERATED` property with `get_source_file_property` or
  `get_property` now always returns exactly `1` or `0`. No other values
  will be returned. Note, that this is a backwards-incompatible change,
  even when policy CMP0118 is unset or set to `OLD`.
* Additionally, as `get_source_file_property` and `get_property` now
  always check if a source-file was marked globally visible, even when
  CMP0118 is unset or set to `OLD`, they possibly return `1` where they
  might have returned `0` before the changes introduced by this commit.
  Note, that this is a backwards-incompatible change, even when policy
  CMP0118 is unset or set to `OLD`.
* As a consequence, the tests for policy CMP0118 being unset or set to
  `OLD` got slightly adjusted, too, to reflect these changes in
  behavior.

91 files changed, 2304 insertions, 837 deletions

diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 968fa54..9e3582c 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -550,6 +550,11 @@ void* CCONV cmAddSource(void* arg, void* arg2)
   // Create the real cmSourceFile instance and copy over saved information.
   cmSourceFile* rsf = mf->GetOrCreateSource(osf->FullPath);
   rsf->SetProperties(osf->Properties);
+  // In case the properties contain the GENERATED property,
+  // mark the real cmSourceFile as generated.
+  if (rsf->GetIsGenerated()) {
+    rsf->MarkAsGenerated();
+  }
   for (std::string const& d : osf->Depends) {
     rsf->AddDepend(d);
   }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 52f1d52..80b3775 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1814,6 +1814,7 @@ void cmGlobalGenerator::ClearGeneratorMembers()
   this->RuleHashes.clear();
   this->DirectoryContentMap.clear();
   this->BinaryDirectories.clear();
+  this->GeneratedFiles.clear();
 }
 
 void cmGlobalGenerator::ComputeTargetObjectDirectory(
@@ -2139,6 +2140,16 @@ void cmGlobalGenerator::AddInstallComponent(const std::string& component)
   }
 }
 
+void cmGlobalGenerator::MarkAsGeneratedFile(const std::string& filepath)
+{
+  this->GeneratedFiles.insert(filepath);
+}
+
+bool cmGlobalGenerator::IsGeneratedFile(const std::string& filepath)
+{
+  return this->GeneratedFiles.find(filepath) != this->GeneratedFiles.end();
+}
+
 void cmGlobalGenerator::EnableInstallTarget()
 {
   this->InstallTargetEnabled = true;
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index afafba9..e933589 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -11,6 +11,7 @@
 #include <set>
 #include <string>
 #include <unordered_map>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 
@@ -290,6 +291,11 @@ public:
 
   void AddInstallComponent(const std::string& component);
 
+  /** Mark the (absolute path to a) file as generated.  */
+  void MarkAsGeneratedFile(const std::string& filepath);
+  /** Determine if the absolute filepath belongs to a generated file.  */
+  bool IsGeneratedFile(const std::string& filepath);
+
   const std::set<std::string>* GetInstallComponents() const
   {
     return &this->InstallComponents;
@@ -722,6 +728,8 @@ private:
 
   std::map<std::string, std::string> RealPaths;
 
+  std::unordered_set<std::string> GeneratedFiles;
+
 #if !defined(CMAKE_BOOTSTRAP)
   // Pool of file locks
   cmFileLockPool FileLockPool;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 50a7d27..4e93785 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3406,11 +3406,7 @@ cmSourceFile* cmMakefile::CreateSource(const std::string& sourceName,
                                        bool generated,
                                        cmSourceFileLocationKind kind)
 {
-  auto sf = cm::make_unique<cmSourceFile>(this, sourceName, kind);
-  if (generated) {
-    sf->SetProperty("GENERATED", "1");
-  }
-
+  auto sf = cm::make_unique<cmSourceFile>(this, sourceName, generated, kind);
   auto name =
     this->GetCMakeInstance()->StripExtension(sf->GetLocation().GetName());
 #if defined(_WIN32) || defined(__APPLE__)
@@ -3442,7 +3438,7 @@ cmSourceFile* cmMakefile::GetOrCreateGeneratedSource(
 {
   cmSourceFile* sf =
     this->GetOrCreateSource(sourceName, true, cmSourceFileLocationKind::Known);
-  sf->SetProperty("GENERATED", "1");
+  sf->MarkAsGenerated(); // In case we did not create the source file.
   return sf;
 }
 
diff --git a/Source/cmQtAutoGenInitializer.cxx b/Source/cmQtAutoGenInitializer.cxx
index f2696a6..f27b788 100644
--- a/Source/cmQtAutoGenInitializer.cxx
+++ b/Source/cmQtAutoGenInitializer.cxx
@@ -1624,7 +1624,7 @@ cmSourceFile* cmQtAutoGenInitializer::RegisterGeneratedSource(
   std::string const& filename)
 {
   cmSourceFile* gFile = this->Makefile->GetOrCreateSource(filename, true);
-  gFile->SetProperty("GENERATED", "1");
+  gFile->MarkAsGenerated();
   gFile->SetProperty("SKIP_AUTOGEN", "1");
   return gFile;
 }
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index d3bcae9..970564d 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -298,7 +298,7 @@ bool HandleAndValidateSourceFilePropertyGENERATED(
         break;
     }
   } else {
-    // TODO: Mark source-file as generated!
+    sf->MarkAsGenerated();
   }
   return true;
 }
diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index 517b570..9d9a7c3 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -16,9 +16,12 @@
 #include "cmake.h"
 
 cmSourceFile::cmSourceFile(cmMakefile* mf, const std::string& name,
-                           cmSourceFileLocationKind kind)
-  : Location(mf, name, kind)
+                           bool generated, cmSourceFileLocationKind kind)
+  : Location(mf, name, (!generated) ? kind : cmSourceFileLocationKind::Known)
 {
+  if (generated) {
+    this->MarkAsGenerated();
+  }
 }
 
 std::string const& cmSourceFile::GetExtension() const
@@ -26,6 +29,8 @@ std::string const& cmSourceFile::GetExtension() const
   return this->Extension;
 }
 
+const std::string propTRUE = "1";
+const std::string propFALSE = "0";
 const std::string cmSourceFile::propLANGUAGE = "LANGUAGE";
 const std::string cmSourceFile::propLOCATION = "LOCATION";
 const std::string cmSourceFile::propGENERATED = "GENERATED";
@@ -112,11 +117,14 @@ bool cmSourceFile::FindFullPath(std::string* error,
                                 std::string* cmp0115Warning)
 {
   // If the file is generated compute the location without checking on disk.
-  if (this->GetIsGenerated()) {
+  // Note: We also check for a locally set GENERATED property, because
+  //       it might have been set before policy CMP0118 was set to NEW.
+  if (this->GetIsGenerated(CheckScope::GlobalAndLocal)) {
     // The file is either already a full path or is relative to the
     // build directory for the target.
     this->Location.DirectoryUseBinary();
     this->FullPath = this->Location.GetFullPath();
+    this->FindFullPathFailed = false;
     return true;
   }
 
@@ -273,11 +281,6 @@ void cmSourceFile::SetProperty(const std::string& prop, const char* value)
   } else {
     this->Properties.SetProperty(prop, value);
   }
-
-  // Update IsGenerated flag
-  if (prop == propGENERATED) {
-    this->IsGenerated = cmIsOn(value);
-  }
 }
 
 void cmSourceFile::AppendProperty(const std::string& prop,
@@ -301,11 +304,6 @@ void cmSourceFile::AppendProperty(const std::string& prop,
   } else {
     this->Properties.AppendProperty(prop, value, asString);
   }
-
-  // Update IsGenerated flag
-  if (prop == propGENERATED) {
-    this->IsGenerated = this->GetPropertyAsBool(propGENERATED);
-  }
 }
 
 cmProp cmSourceFile::GetPropertyForUser(const std::string& prop)
@@ -336,6 +334,21 @@ cmProp cmSourceFile::GetPropertyForUser(const std::string& prop)
     return &this->GetOrDetermineLanguage();
   }
 
+  // Special handling for GENERATED property.
+  if (prop == propGENERATED) {
+    // We need to check policy CMP0118 in order to determine if we need to
+    // possibly consider the value of a locally set GENERATED property, too.
+    auto policyStatus =
+      this->Location.GetMakefile()->GetPolicyStatus(cmPolicies::CMP0118);
+    if (this->GetIsGenerated(
+          (policyStatus == cmPolicies::WARN || policyStatus == cmPolicies::OLD)
+            ? CheckScope::GlobalAndLocal
+            : CheckScope::Global)) {
+      return &propTRUE;
+    }
+    return &propFALSE;
+  }
+
   // Perform the normal property lookup.
   return this->GetProperty(prop);
 }
@@ -411,11 +424,29 @@ bool cmSourceFile::GetPropertyAsBool(const std::string& prop) const
   return cmIsOn(this->GetProperty(prop));
 }
 
+void cmSourceFile::MarkAsGenerated()
+{
+  this->IsGenerated = true;
+  auto& mf = *this->Location.GetMakefile();
+  mf.GetGlobalGenerator()->MarkAsGeneratedFile(this->ResolveFullPath());
+}
+
+bool cmSourceFile::GetIsGenerated(CheckScope checkScope) const
+{
+  if (this->IsGenerated) {
+    // Globally marked as generated!
+    return true;
+  }
+  if (checkScope == CheckScope::GlobalAndLocal) {
+    // Check locally stored properties.
+    return this->GetPropertyAsBool(propGENERATED);
+  }
+  return false;
+}
+
 void cmSourceFile::SetProperties(cmPropertyMap properties)
 {
   this->Properties = std::move(properties);
-
-  this->IsGenerated = this->GetPropertyAsBool(propGENERATED);
 }
 
 cmCustomCommand* cmSourceFile::GetCustomCommand() const
diff --git a/Source/cmSourceFile.h b/Source/cmSourceFile.h
index 3ad2664..94b5cc8 100644
--- a/Source/cmSourceFile.h
+++ b/Source/cmSourceFile.h
@@ -20,18 +20,18 @@ class cmMakefile;
 /** \class cmSourceFile
  * \brief Represent a class loaded from a makefile.
  *
- * cmSourceFile is represents a class loaded from
- * a makefile.
+ * cmSourceFile represents a class loaded from a makefile.
  */
 class cmSourceFile
 {
 public:
   /**
-   * Construct with the makefile storing the source and the initial
-   * name referencing it.
+   * Construct with the makefile storing the source and the initial name
+   * referencing it. If it shall be marked as generated, this source file's
+   * kind is assumed to be known, regardless of the given value.
    */
   cmSourceFile(
-    cmMakefile* mf, const std::string& name,
+    cmMakefile* mf, const std::string& name, bool generated,
     cmSourceFileLocationKind kind = cmSourceFileLocationKind::Ambiguous);
 
   /**
@@ -54,9 +54,29 @@ public:
       command like get_property or get_source_file_property.  */
   cmProp GetPropertyForUser(const std::string& prop);
 
-  //! Checks is the GENERATED property is set and true
-  /// @return Equivalent to GetPropertyAsBool("GENERATED")
-  bool GetIsGenerated() const { return this->IsGenerated; }
+  /// Marks this file as generated
+  /**
+   * This stores this file's path in the global table for all generated source
+   * files.
+   */
+  void MarkAsGenerated();
+  enum class CheckScope
+  {
+    Global,
+    GlobalAndLocal
+  };
+  /// Determines if this source file is marked as generated.
+  /**
+   * This will check if this file's path is stored in the global table of all
+   * generated source files. If that is not the case and checkScope is set to
+   * GlobalAndLocal the value of the possibly existing local GENERATED property
+   * is returned instead.
+   * @param checkScope Determines if alternatively for backwards-compatibility
+   * a local GENERATED property should be considered, too.
+   * @return true if this source file is marked as generated, otherwise false.
+   */
+  bool GetIsGenerated(
+    CheckScope checkScope = CheckScope::GlobalAndLocal) const;
 
   const std::vector<BT<std::string>>& GetCompileOptions() const
   {
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-stderr.txt
new file mode 100644
index 0000000..85ff65c
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-stderr.txt
@@ -0,0 +1,16 @@
+^prop: `0`
+CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-build/GeneratedMain\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test1\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test1\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1.cmake
new file mode 100644
index 0000000..bbbee43
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test1.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-stderr.txt
new file mode 100644
index 0000000..024d263
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-stderr.txt
@@ -0,0 +1,57 @@
+^Generated_source0\.cpp: # 1a # GENERATED = `1`
+Generated_source0\.cpp: # 1b # GENERATED = `1`
+Generated_source0\.cpp: # 2a # GENERATED = `1`
+Generated_source0\.cpp: # 2b # GENERATED = `1`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
+Generated_source1\.cpp: # 1a # GENERATED = `1`
+Generated_source1\.cpp: # 1b # GENERATED = `1`
+Generated_source1\.cpp: # 2a # GENERATED = `1`
+Generated_source1\.cpp: # 2b # GENERATED = `1`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
+Generated_source5\.cpp: # 1a # GENERATED = `1`
+Generated_source5\.cpp: # 1b # GENERATED = `1`
+Generated_source5\.cpp: # 2a # GENERATED = `1`
+Generated_source5\.cpp: # 2b # GENERATED = `1`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
+Generated_source6\.cpp: # 1a # GENERATED = `1`
+Generated_source6\.cpp: # 1b # GENERATED = `1`
+Generated_source6\.cpp: # 2a # GENERATED = `1`
+Generated_source6\.cpp: # 2b # GENERATED = `1`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test10\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-build/Generated_source4\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test10\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test10\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable4
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test10\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10.cmake
new file mode 100644
index 0000000..15a7178
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test10.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-stderr.txt
new file mode 100644
index 0000000..7e660ad
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-stderr.txt
@@ -0,0 +1,86 @@
+^(CMake Warning \(dev\) at subdir-Common-Test11/CMakeLists\.txt:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+(CMake Warning \(dev\) at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_subdirectory\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test11\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++)+)+
+Generated_source0\.cpp: # 1a # GENERATED = `1`
+Generated_source0\.cpp: # 1b # GENERATED = `1`
+Generated_source0\.cpp: # 2a # GENERATED = `1`
+Generated_source0\.cpp: # 2b # GENERATED = `1`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
+Generated_source1\.cpp: # 1a # GENERATED = `1`
+Generated_source1\.cpp: # 1b # GENERATED = `1`
+Generated_source1\.cpp: # 2a # GENERATED = `1`
+Generated_source1\.cpp: # 2b # GENERATED = `1`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
+Generated_source5\.cpp: # 1a # GENERATED = `0`
+Generated_source5\.cpp: # 1b # GENERATED = `0`
+Generated_source5\.cpp: # 2a # GENERATED = `0`
+Generated_source5\.cpp: # 2b # GENERATED = `0`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
+Generated_source6\.cpp: # 1a # GENERATED = `0`
+Generated_source6\.cpp: # 1b # GENERATED = `0`
+Generated_source6\.cpp: # 2a # GENERATED = `0`
+Generated_source6\.cpp: # 2b # GENERATED = `0`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test11\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test11\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test11\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+(CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable[4-6]
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test11\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++)+
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11.cmake
new file mode 100644
index 0000000..cb87a86
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test11.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12-stderr.txt
new file mode 100644
index 0000000..404787c
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12-stderr.txt
@@ -0,0 +1,51 @@
+^CMake Error at subdir-Common-Test12/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
+  TARGET 'executable[4-6]' was not created in this directory\.
++
+CMake Error at subdir-Common-Test12/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
+  TARGET 'executable[4-6]' was not created in this directory\.
++
+CMake Error at subdir-Common-Test12/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
+  TARGET 'executable[4-6]' was not created in this directory\.
++
+Generated_source0\.cpp: # 1a # GENERATED = `1`
+Generated_source0\.cpp: # 1b # GENERATED = `1`
+Generated_source0\.cpp: # 2a # GENERATED = `1`
+Generated_source0\.cpp: # 2b # GENERATED = `1`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
+Generated_source1\.cpp: # 1a # GENERATED = `1`
+Generated_source1\.cpp: # 1b # GENERATED = `1`
+Generated_source1\.cpp: # 2a # GENERATED = `1`
+Generated_source1\.cpp: # 2b # GENERATED = `1`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
+Generated_source5\.cpp: # 1a # GENERATED = `1`
+Generated_source5\.cpp: # 1b # GENERATED = `1`
+Generated_source5\.cpp: # 2a # GENERATED = `1`
+Generated_source5\.cpp: # 2b # GENERATED = `1`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
+Generated_source6\.cpp: # 1a # GENERATED = `1`
+Generated_source6\.cpp: # 1b # GENERATED = `1`
+Generated_source6\.cpp: # 2a # GENERATED = `1`
+Generated_source6\.cpp: # 2b # GENERATED = `1`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12.cmake
new file mode 100644
index 0000000..61bf977
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test12.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-stderr.txt
new file mode 100644
index 0000000..92ac33e
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-stderr.txt
@@ -0,0 +1,64 @@
+^CMake Error at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
+  TARGET 'executable[4-6]' was not created in this directory\.
++
+CMake Error at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
+  TARGET 'executable[4-6]' was not created in this directory\.
++
+CMake Error at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
+  TARGET 'executable[4-6]' was not created in this directory\.
++
+(CMake Warning \(dev\) at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+(CMake Warning \(dev\) at CMP0118-Common-Test13\.cmake:[0-9]+ \(add_subdirectory\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test13\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++)+)+
+Generated_source0\.cpp: # 1a # GENERATED = `1`
+Generated_source0\.cpp: # 1b # GENERATED = `1`
+Generated_source0\.cpp: # 2a # GENERATED = `1`
+Generated_source0\.cpp: # 2b # GENERATED = `1`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
+Generated_source1\.cpp: # 1a # GENERATED = `1`
+Generated_source1\.cpp: # 1b # GENERATED = `1`
+Generated_source1\.cpp: # 2a # GENERATED = `1`
+Generated_source1\.cpp: # 2b # GENERATED = `1`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
+Generated_source5\.cpp: # 1a # GENERATED = `0`
+Generated_source5\.cpp: # 1b # GENERATED = `0`
+Generated_source5\.cpp: # 2a # GENERATED = `0`
+Generated_source5\.cpp: # 2b # GENERATED = `0`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
+Generated_source6\.cpp: # 1a # GENERATED = `0`
+Generated_source6\.cpp: # 1b # GENERATED = `0`
+Generated_source6\.cpp: # 2a # GENERATED = `0`
+Generated_source6\.cpp: # 2b # GENERATED = `0`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13.cmake
new file mode 100644
index 0000000..569e4c6
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test13.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-stderr.txt
new file mode 100644
index 0000000..cd14945
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-stderr.txt
@@ -0,0 +1,57 @@
+^Generated_source0\.cpp: # 1a # GENERATED = `1`
+Generated_source0\.cpp: # 1b # GENERATED = `1`
+Generated_source0\.cpp: # 2a # GENERATED = `1`
+Generated_source0\.cpp: # 2b # GENERATED = `1`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
+Generated_source1\.cpp: # 1a # GENERATED = `1`
+Generated_source1\.cpp: # 1b # GENERATED = `1`
+Generated_source1\.cpp: # 2a # GENERATED = `1`
+Generated_source1\.cpp: # 2b # GENERATED = `1`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
+Generated_source5\.cpp: # 1a # GENERATED = `1`
+Generated_source5\.cpp: # 1b # GENERATED = `1`
+Generated_source5\.cpp: # 2a # GENERATED = `1`
+Generated_source5\.cpp: # 2b # GENERATED = `1`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
+Generated_source6\.cpp: # 1a # GENERATED = `1`
+Generated_source6\.cpp: # 1b # GENERATED = `1`
+Generated_source6\.cpp: # 2a # GENERATED = `1`
+Generated_source6\.cpp: # 2b # GENERATED = `1`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test14\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-build/Generated_source4\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test14\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test14\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable4
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test14\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14.cmake
new file mode 100644
index 0000000..e7d8d77
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test14.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-stderr.txt
new file mode 100644
index 0000000..6c66392
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-stderr.txt
@@ -0,0 +1,86 @@
+^(CMake Warning \(dev\) at subdir-Common-Test15/CMakeLists\.txt:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+(CMake Warning \(dev\) at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_subdirectory\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test15\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++)+)+
+Generated_source0\.cpp: # 1a # GENERATED = `1`
+Generated_source0\.cpp: # 1b # GENERATED = `1`
+Generated_source0\.cpp: # 2a # GENERATED = `1`
+Generated_source0\.cpp: # 2b # GENERATED = `1`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
+Generated_source1\.cpp: # 1a # GENERATED = `1`
+Generated_source1\.cpp: # 1b # GENERATED = `1`
+Generated_source1\.cpp: # 2a # GENERATED = `1`
+Generated_source1\.cpp: # 2b # GENERATED = `1`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
+Generated_source5\.cpp: # 1a # GENERATED = `0`
+Generated_source5\.cpp: # 1b # GENERATED = `0`
+Generated_source5\.cpp: # 2a # GENERATED = `0`
+Generated_source5\.cpp: # 2b # GENERATED = `0`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
+Generated_source6\.cpp: # 1a # GENERATED = `0`
+Generated_source6\.cpp: # 1b # GENERATED = `0`
+Generated_source6\.cpp: # 2a # GENERATED = `0`
+Generated_source6\.cpp: # 2b # GENERATED = `0`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test15\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test15\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test15\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+(CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable[4-6]
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test15\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++)+
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15.cmake
new file mode 100644
index 0000000..93513ae
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test15.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test2-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test2-stderr.txt
new file mode 100644
index 0000000..403ce5a
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test2-stderr.txt
@@ -0,0 +1 @@
+^prop: `1`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test2.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test2.cmake
new file mode 100644
index 0000000..ee8233d
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test2.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test2.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3-stderr.txt
new file mode 100644
index 0000000..4002989
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3-stderr.txt
@@ -0,0 +1,93 @@
+^Generated_with_full_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_path2\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_path2\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_path2\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 1a # GENERATED = `1`
+Generated_with_relative_path2\.cpp: # 1b # GENERATED = `1`
+Generated_with_relative_path2\.cpp: # 2a # GENERATED = `1`
+Generated_with_relative_path2\.cpp: # 2b # GENERATED = `1`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2a # GENERATED = `1`
+Generated_with_relative_path3\.cpp: # 2b # GENERATED = `1`
+Generated_with_relative_path3\.cpp: # 3a # GENERATED = `1`
+Generated_with_relative_path3\.cpp: # 3b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test3-build/Generated_with_full_path3\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test3\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test3-build/Generated_with_full_path3\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test3\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test3-build/Generated_with_full_path3\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test3\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test3-build/Generated_with_full_path3\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test3\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+(CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable[13-5]
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test3\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++)+
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3.cmake
new file mode 100644
index 0000000..b9533fd
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test3.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b-stderr.txt
new file mode 100644
index 0000000..21177bc
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b-stderr.txt
@@ -0,0 +1,93 @@
+^Generated_with_full_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_path2\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_path2\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_path2\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 1a # GENERATED = `1`
+Generated_with_relative_path2\.cpp: # 1b # GENERATED = `1`
+Generated_with_relative_path2\.cpp: # 2a # GENERATED = `1`
+Generated_with_relative_path2\.cpp: # 2b # GENERATED = `1`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2a # GENERATED = `1`
+Generated_with_relative_path3\.cpp: # 2b # GENERATED = `1`
+Generated_with_relative_path3\.cpp: # 3a # GENERATED = `1`
+Generated_with_relative_path3\.cpp: # 3b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test3b-build/Generated_with_full_path3\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test3b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test3b-build/Generated_with_full_path3\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test3b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test3b-build/Generated_with_full_path3\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test3b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test3b-build/Generated_with_full_path3\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test3b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+(CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable[13-5]
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test3b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++)+
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b.cmake
new file mode 100644
index 0000000..79631e7
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test3b.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4-stderr.txt
new file mode 100644
index 0000000..42c19a5
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4-stderr.txt
@@ -0,0 +1,173 @@
+^CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_path1\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_relative_path1\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_relative_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test4-build/Generated_with_full_path1\.cpp|CMP0118-NEW-Test4-build/Generated_with_relative_path1\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test4-build/Generated_with_full_path1\.cpp|CMP0118-NEW-Test4-build/Generated_with_relative_path1\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test4-build/Generated_with_full_path1\.cpp|CMP0118-NEW-Test4-build/Generated_with_relative_path1\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test4-build/Generated_with_full_path1\.cpp|CMP0118-NEW-Test4-build/Generated_with_relative_path1\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test4-build/Generated_with_full_path1\.cpp|CMP0118-NEW-Test4-build/Generated_with_relative_path1\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+(CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable[1-5]
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++)+
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4.cmake
new file mode 100644
index 0000000..8a7d35a
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test4.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b-stderr.txt
new file mode 100644
index 0000000..58f8d89
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b-stderr.txt
@@ -0,0 +1,173 @@
+^CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_path1\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_relative_path1\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_relative_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-NEW-Test4b-build/Generated_with_relative_path1\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-NEW-Test4b-build/Generated_with_relative_path1\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-NEW-Test4b-build/Generated_with_relative_path1\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-NEW-Test4b-build/Generated_with_relative_path1\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-NEW-Test4b-build/Generated_with_relative_path1\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+(CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable[1-5]
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test4b\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++)+
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b.cmake
new file mode 100644
index 0000000..c03a39d
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test4b.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5-stderr.txt
new file mode 100644
index 0000000..0d26a57
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5-stderr.txt
@@ -0,0 +1,180 @@
+^Generated_with_full_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
+  Policy CMP0118 is set to NEW and the following non-boolean value given for
+  property 'GENERATED' is therefore not allowed:
+
+  Junk-value
+
+  Replace it with a boolean value!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_relative_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
+  Policy CMP0118 is set to NEW and the following non-boolean value given for
+  property 'GENERATED' is therefore not allowed:
+
+  Junk-value
+
+  Replace it with a boolean value!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
+  Policy CMP0118 is set to NEW and the following non-boolean value given for
+  property 'GENERATED' is therefore not allowed:
+
+  Junk-value
+
+  Replace it with a boolean value!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.cpp)
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+(CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable[235-9]
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test5\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++)+
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5.cmake
new file mode 100644
index 0000000..691f94a
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test5.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-stderr.txt
new file mode 100644
index 0000000..c3fdd96
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-stderr.txt
@@ -0,0 +1,51 @@
+^Generated_source1\.cpp: # 1a # GENERATED = `1`
+Generated_source1\.cpp: # 1b # GENERATED = `1`
+Generated_source1\.cpp: # 2a # GENERATED = `1`
+Generated_source1\.cpp: # 2b # GENERATED = `1`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
+Generated_source5\.cpp: # 1a # GENERATED = `1`
+Generated_source5\.cpp: # 1b # GENERATED = `1`
+Generated_source5\.cpp: # 2a # GENERATED = `1`
+Generated_source5\.cpp: # 2b # GENERATED = `1`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
+Generated_source6\.cpp: # 1a # GENERATED = `1`
+Generated_source6\.cpp: # 1b # GENERATED = `1`
+Generated_source6\.cpp: # 2a # GENERATED = `1`
+Generated_source6\.cpp: # 2b # GENERATED = `1`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test6\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-build/Generated_source4\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test6\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test6\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable4
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test6\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6.cmake
new file mode 100644
index 0000000..09b87a5
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test6.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-stderr.txt
new file mode 100644
index 0000000..4c2a2ae
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-stderr.txt
@@ -0,0 +1,80 @@
+^(CMake Warning \(dev\) at subdir-Common-Test7/CMakeLists\.txt:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+(CMake Warning \(dev\) at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_subdirectory\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test7\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++)+)+
+Generated_source1\.cpp: # 1a # GENERATED = `1`
+Generated_source1\.cpp: # 1b # GENERATED = `1`
+Generated_source1\.cpp: # 2a # GENERATED = `1`
+Generated_source1\.cpp: # 2b # GENERATED = `1`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
+Generated_source5\.cpp: # 1a # GENERATED = `0`
+Generated_source5\.cpp: # 1b # GENERATED = `0`
+Generated_source5\.cpp: # 2a # GENERATED = `0`
+Generated_source5\.cpp: # 2b # GENERATED = `0`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
+Generated_source6\.cpp: # 1a # GENERATED = `0`
+Generated_source6\.cpp: # 1b # GENERATED = `0`
+Generated_source6\.cpp: # 2a # GENERATED = `0`
+Generated_source6\.cpp: # 2b # GENERATED = `0`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test7\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test7\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test7\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+(CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable[4-6]
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test7\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++)+
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7.cmake
new file mode 100644
index 0000000..ceb8beb
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test7.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-stderr.txt
new file mode 100644
index 0000000..44f94d4
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-stderr.txt
@@ -0,0 +1,51 @@
+^Generated_source1\.cpp: # 1a # GENERATED = `0`
+Generated_source1\.cpp: # 1b # GENERATED = `0`
+Generated_source1\.cpp: # 2a # GENERATED = `0`
+Generated_source1\.cpp: # 2b # GENERATED = `0`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
+Generated_source5\.cpp: # 1a # GENERATED = `1`
+Generated_source5\.cpp: # 1b # GENERATED = `1`
+Generated_source5\.cpp: # 2a # GENERATED = `1`
+Generated_source5\.cpp: # 2b # GENERATED = `1`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
+Generated_source6\.cpp: # 1a # GENERATED = `1`
+Generated_source6\.cpp: # 1b # GENERATED = `1`
+Generated_source6\.cpp: # 2a # GENERATED = `1`
+Generated_source6\.cpp: # 2b # GENERATED = `1`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test8\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-build/Generated_source4\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test8\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test8\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable4
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test8\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8.cmake
new file mode 100644
index 0000000..6878b94
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test8.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-result.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-stderr.txt
new file mode 100644
index 0000000..53e1399
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-stderr.txt
@@ -0,0 +1,80 @@
+^(CMake Warning \(dev\) at subdir-Common-Test9/CMakeLists\.txt:[0-9]+ \(set_property\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++
+(CMake Warning \(dev\) at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_subdirectory\):
+  Unsetting the 'GENERATED' property is not allowed under CMP0118!
+
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test9\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
+This warning is for project developers\.  Use -Wno-dev to suppress it\.
++)+)+
+Generated_source1\.cpp: # 1a # GENERATED = `0`
+Generated_source1\.cpp: # 1b # GENERATED = `0`
+Generated_source1\.cpp: # 2a # GENERATED = `0`
+Generated_source1\.cpp: # 2b # GENERATED = `0`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `0`
+Generated_source2\.cpp: # 1b # GENERATED = `0`
+Generated_source2\.cpp: # 2a # GENERATED = `0`
+Generated_source2\.cpp: # 2b # GENERATED = `0`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `0`
+Generated_source3\.cpp: # 1b # GENERATED = `0`
+Generated_source3\.cpp: # 2a # GENERATED = `0`
+Generated_source3\.cpp: # 2b # GENERATED = `0`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
+Generated_source5\.cpp: # 1a # GENERATED = `0`
+Generated_source5\.cpp: # 1b # GENERATED = `0`
+Generated_source5\.cpp: # 2a # GENERATED = `0`
+Generated_source5\.cpp: # 2b # GENERATED = `0`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
+Generated_source6\.cpp: # 1a # GENERATED = `0`
+Generated_source6\.cpp: # 1b # GENERATED = `0`
+Generated_source6\.cpp: # 2a # GENERATED = `0`
+Generated_source6\.cpp: # 2b # GENERATED = `0`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test9\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test9\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_executable\):
+  Cannot find source file:
+
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-build/Generated_source[4-6]\.cpp
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test9\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++
+(CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_executable\):
+  No SOURCES given to target: executable[4-6]
+Call Stack \(most recent call first\):
+  CMP0118-NEW-Test9\.cmake:[0-9]+ \(include\)
+  CMakeLists\.txt:[0-9]+ \(include\)
++)+
+CMake Generate step failed\.  Build files cannot be regenerated correctly\.$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9.cmake b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9.cmake
new file mode 100644
index 0000000..00b05fd
--- /dev/null
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0118 NEW)
+include(CMP0118-Common-Test9.cmake)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt
index 1bf5e86..491489d 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt
@@ -1,4 +1,4 @@
-^prop: ``
+^prop: `0`
 CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt
index 72880aa..12dd48f 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt
@@ -2,44 +2,44 @@
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `1`
 Generated_source2\.cpp: # 1b # GENERATED = `1`
 Generated_source2\.cpp: # 2a # GENERATED = `1`
 Generated_source2\.cpp: # 2b # GENERATED = `1`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `1`
 Generated_source3\.cpp: # 1b # GENERATED = `1`
 Generated_source3\.cpp: # 2a # GENERATED = `1`
 Generated_source3\.cpp: # 2b # GENERATED = `1`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `1`
 Generated_source5\.cpp: # 1b # GENERATED = `1`
 Generated_source5\.cpp: # 2a # GENERATED = `1`
 Generated_source5\.cpp: # 2b # GENERATED = `1`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `1`
 Generated_source6\.cpp: # 1b # GENERATED = `1`
 Generated_source6\.cpp: # 2a # GENERATED = `1`
 Generated_source6\.cpp: # 2b # GENERATED = `1`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test10\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt
index ea278aa..91db26a 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt
@@ -2,48 +2,48 @@
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source2\.cpp: # 1a # GENERATED = `0`
-Generated_source2\.cpp: # 1b # GENERATED = `0`
-Generated_source2\.cpp: # 2a # GENERATED = `0`
-Generated_source2\.cpp: # 2b # GENERATED = `0`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source3\.cpp: # 1a # GENERATED = `0`
-Generated_source3\.cpp: # 1b # GENERATED = `0`
-Generated_source3\.cpp: # 2a # GENERATED = `0`
-Generated_source3\.cpp: # 2b # GENERATED = `0`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `0`
 Generated_source5\.cpp: # 1b # GENERATED = `0`
 Generated_source5\.cpp: # 2a # GENERATED = `0`
 Generated_source5\.cpp: # 2b # GENERATED = `0`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `0`
 Generated_source6\.cpp: # 1b # GENERATED = `0`
 Generated_source6\.cpp: # 2a # GENERATED = `0`
 Generated_source6\.cpp: # 2b # GENERATED = `0`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test11\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -51,7 +51,7 @@ Call Stack \(most recent call first\):
 CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test11\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -59,29 +59,13 @@ Call Stack \(most recent call first\):
 CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[2-6]\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-OLD-Test11\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)
-+
-CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
-  Cannot find source file:
-
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[2-6]\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-OLD-Test11\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)
-+
-CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
-  Cannot find source file:
-
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test11\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
 (CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
-  No SOURCES given to target: executable[2-6]
+  No SOURCES given to target: executable[4-6]
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test11\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt
index 33b2c89..404787c 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt
@@ -11,41 +11,41 @@ Generated_source0\.cpp: # 1a # GENERATED = `1`
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `1`
 Generated_source2\.cpp: # 1b # GENERATED = `1`
 Generated_source2\.cpp: # 2a # GENERATED = `1`
 Generated_source2\.cpp: # 2b # GENERATED = `1`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `1`
 Generated_source3\.cpp: # 1b # GENERATED = `1`
 Generated_source3\.cpp: # 2a # GENERATED = `1`
 Generated_source3\.cpp: # 2b # GENERATED = `1`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `1`
 Generated_source5\.cpp: # 1b # GENERATED = `1`
 Generated_source5\.cpp: # 2a # GENERATED = `1`
 Generated_source5\.cpp: # 2b # GENERATED = `1`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `1`
 Generated_source6\.cpp: # 1b # GENERATED = `1`
 Generated_source6\.cpp: # 2a # GENERATED = `1`
 Generated_source6\.cpp: # 2b # GENERATED = `1`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`$
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt
index c8edad4..07f2f10 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt
@@ -11,41 +11,41 @@ Generated_source0\.cpp: # 1a # GENERATED = `1`
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source2\.cpp: # 1a # GENERATED = `0`
-Generated_source2\.cpp: # 1b # GENERATED = `0`
-Generated_source2\.cpp: # 2a # GENERATED = `0`
-Generated_source2\.cpp: # 2b # GENERATED = `0`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source3\.cpp: # 1a # GENERATED = `0`
-Generated_source3\.cpp: # 1b # GENERATED = `0`
-Generated_source3\.cpp: # 2a # GENERATED = `0`
-Generated_source3\.cpp: # 2b # GENERATED = `0`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `0`
 Generated_source5\.cpp: # 1b # GENERATED = `0`
 Generated_source5\.cpp: # 2a # GENERATED = `0`
 Generated_source5\.cpp: # 2b # GENERATED = `0`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `0`
 Generated_source6\.cpp: # 1b # GENERATED = `0`
 Generated_source6\.cpp: # 2a # GENERATED = `0`
 Generated_source6\.cpp: # 2b # GENERATED = `0`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`$
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt
index 8fdee89..395637a 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt
@@ -2,44 +2,44 @@
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `1`
 Generated_source2\.cpp: # 1b # GENERATED = `1`
 Generated_source2\.cpp: # 2a # GENERATED = `1`
 Generated_source2\.cpp: # 2b # GENERATED = `1`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `1`
 Generated_source3\.cpp: # 1b # GENERATED = `1`
 Generated_source3\.cpp: # 2a # GENERATED = `1`
 Generated_source3\.cpp: # 2b # GENERATED = `1`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `1`
 Generated_source5\.cpp: # 1b # GENERATED = `1`
 Generated_source5\.cpp: # 2a # GENERATED = `1`
 Generated_source5\.cpp: # 2b # GENERATED = `1`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `1`
 Generated_source6\.cpp: # 1b # GENERATED = `1`
 Generated_source6\.cpp: # 2a # GENERATED = `1`
 Generated_source6\.cpp: # 2b # GENERATED = `1`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test14\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt
index 686678d..d6799b4 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt
@@ -2,48 +2,48 @@
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source2\.cpp: # 1a # GENERATED = `0`
-Generated_source2\.cpp: # 1b # GENERATED = `0`
-Generated_source2\.cpp: # 2a # GENERATED = `0`
-Generated_source2\.cpp: # 2b # GENERATED = `0`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source3\.cpp: # 1a # GENERATED = `0`
-Generated_source3\.cpp: # 1b # GENERATED = `0`
-Generated_source3\.cpp: # 2a # GENERATED = `0`
-Generated_source3\.cpp: # 2b # GENERATED = `0`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `0`
 Generated_source5\.cpp: # 1b # GENERATED = `0`
 Generated_source5\.cpp: # 2a # GENERATED = `0`
 Generated_source5\.cpp: # 2b # GENERATED = `0`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `0`
 Generated_source6\.cpp: # 1b # GENERATED = `0`
 Generated_source6\.cpp: # 2a # GENERATED = `0`
 Generated_source6\.cpp: # 2b # GENERATED = `0`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test15\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -51,7 +51,7 @@ Call Stack \(most recent call first\):
 CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test15\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -59,29 +59,13 @@ Call Stack \(most recent call first\):
 CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[2-6]\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-OLD-Test15\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)
-+
-CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
-  Cannot find source file:
-
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[2-6]\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-OLD-Test15\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)
-+
-CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
-  Cannot find source file:
-
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test15\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
 (CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
-  No SOURCES given to target: executable[2-6]
+  No SOURCES given to target: executable[4-6]
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test15\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt
index 367baf1..4764494 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt
@@ -2,34 +2,34 @@
 Generated_with_full_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 1a # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_relative_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_relative_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_relative_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_relative_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path3\.cpp: # 2b # GENERATED = `1`
 Generated_with_relative_path3\.cpp: # 3a # GENERATED = `1`
@@ -38,20 +38,20 @@ Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_source_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_source_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt
index 66bc73e..33c4375 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt
@@ -2,34 +2,34 @@
 Generated_with_full_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 1a # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_relative_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_relative_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_relative_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_relative_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path3\.cpp: # 2b # GENERATED = `1`
 Generated_with_relative_path3\.cpp: # 3a # GENERATED = `1`
@@ -38,20 +38,20 @@ Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_source_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_source_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt
index c00f05c..1723ece 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt
@@ -2,34 +2,34 @@
 Generated_with_full_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 1a # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_relative_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_relative_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_relative_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_relative_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 3a # GENERATED = `0`
@@ -38,20 +38,20 @@ Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_source_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_source_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt
index de7d966..b7b37e9 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt
@@ -2,34 +2,34 @@
 Generated_with_full_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 1a # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_relative_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_relative_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_relative_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_relative_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 3a # GENERATED = `0`
@@ -38,20 +38,20 @@ Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_source_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_source_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt
index 0cc80ea..3ad00b7 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt
@@ -1,57 +1,57 @@
-^Generated_with_full_path1\.cpp: # 1a # GENERATED = `tRue`
-Generated_with_full_path1\.cpp: # 1b # GENERATED = `tRue`
-Generated_with_full_path1\.cpp: # 2a # GENERATED = `tRue`
-Generated_with_full_path1\.cpp: # 2b # GENERATED = `tRue`
-Generated_with_full_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_path2\.cpp: # 1a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_path2\.cpp: # 1b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_path2\.cpp: # 2a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_path2\.cpp: # 2b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 1a # GENERATED = `Junk-value`
-Generated_with_full_path3\.cpp: # 1b # GENERATED = `Junk-value`
-Generated_with_full_path3\.cpp: # 2a # GENERATED = `Junk-value`
-Generated_with_full_path3\.cpp: # 2b # GENERATED = `Junk-value`
-Generated_with_full_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_relative_path1\.cpp: # 1a # GENERATED = `tRue`
-Generated_with_relative_path1\.cpp: # 1b # GENERATED = `tRue`
-Generated_with_relative_path1\.cpp: # 2a # GENERATED = `tRue`
-Generated_with_relative_path1\.cpp: # 2b # GENERATED = `tRue`
-Generated_with_relative_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_relative_path2\.cpp: # 1a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_relative_path2\.cpp: # 1b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_relative_path2\.cpp: # 2a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_relative_path2\.cpp: # 2b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_relative_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_relative_path3\.cpp: # 1a # GENERATED = `Junk-value`
-Generated_with_relative_path3\.cpp: # 1b # GENERATED = `Junk-value`
-Generated_with_relative_path3\.cpp: # 2a # GENERATED = `Junk-value`
-Generated_with_relative_path3\.cpp: # 2b # GENERATED = `Junk-value`
-Generated_with_relative_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `tRue`
-Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `tRue`
-Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `tRue`
-Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `tRue`
-Generated_with_full_source_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path2\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+^Generated_with_full_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt
index b2a0da0..475c559 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt
@@ -2,38 +2,38 @@
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `1`
 Generated_source2\.cpp: # 1b # GENERATED = `1`
 Generated_source2\.cpp: # 2a # GENERATED = `1`
 Generated_source2\.cpp: # 2b # GENERATED = `1`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `1`
 Generated_source3\.cpp: # 1b # GENERATED = `1`
 Generated_source3\.cpp: # 2a # GENERATED = `1`
 Generated_source3\.cpp: # 2b # GENERATED = `1`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `1`
 Generated_source5\.cpp: # 1b # GENERATED = `1`
 Generated_source5\.cpp: # 2a # GENERATED = `1`
 Generated_source5\.cpp: # 2b # GENERATED = `1`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `1`
 Generated_source6\.cpp: # 1b # GENERATED = `1`
 Generated_source6\.cpp: # 2a # GENERATED = `1`
 Generated_source6\.cpp: # 2b # GENERATED = `1`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test6\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt
index f62713e..5f490ee 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt
@@ -2,38 +2,38 @@
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `0`
 Generated_source2\.cpp: # 1b # GENERATED = `0`
 Generated_source2\.cpp: # 2a # GENERATED = `0`
 Generated_source2\.cpp: # 2b # GENERATED = `0`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `0`
 Generated_source3\.cpp: # 1b # GENERATED = `0`
 Generated_source3\.cpp: # 2a # GENERATED = `0`
 Generated_source3\.cpp: # 2b # GENERATED = `0`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `0`
 Generated_source5\.cpp: # 1b # GENERATED = `0`
 Generated_source5\.cpp: # 2a # GENERATED = `0`
 Generated_source5\.cpp: # 2b # GENERATED = `0`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `0`
 Generated_source6\.cpp: # 1b # GENERATED = `0`
 Generated_source6\.cpp: # 2a # GENERATED = `0`
 Generated_source6\.cpp: # 2b # GENERATED = `0`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt
index 59b3868..bd82224 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt
@@ -1,39 +1,39 @@
-^Generated_source1\.cpp: # 1a # GENERATED = ``
-Generated_source1\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source1\.cpp: # 2a # GENERATED = ``
-Generated_source1\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+^Generated_source1\.cpp: # 1a # GENERATED = `0`
+Generated_source1\.cpp: # 1b # GENERATED = `0`
+Generated_source1\.cpp: # 2a # GENERATED = `0`
+Generated_source1\.cpp: # 2b # GENERATED = `0`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `1`
 Generated_source2\.cpp: # 1b # GENERATED = `1`
 Generated_source2\.cpp: # 2a # GENERATED = `1`
 Generated_source2\.cpp: # 2b # GENERATED = `1`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `1`
 Generated_source3\.cpp: # 1b # GENERATED = `1`
 Generated_source3\.cpp: # 2a # GENERATED = `1`
 Generated_source3\.cpp: # 2b # GENERATED = `1`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `1`
 Generated_source5\.cpp: # 1b # GENERATED = `1`
 Generated_source5\.cpp: # 2a # GENERATED = `1`
 Generated_source5\.cpp: # 2b # GENERATED = `1`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `1`
 Generated_source6\.cpp: # 1b # GENERATED = `1`
 Generated_source6\.cpp: # 2a # GENERATED = `1`
 Generated_source6\.cpp: # 2b # GENERATED = `1`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test8\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt
index c00b55b..172e4eb 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt
@@ -1,39 +1,39 @@
-^Generated_source1\.cpp: # 1a # GENERATED = ``
-Generated_source1\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source1\.cpp: # 2a # GENERATED = ``
-Generated_source1\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+^Generated_source1\.cpp: # 1a # GENERATED = `0`
+Generated_source1\.cpp: # 1b # GENERATED = `0`
+Generated_source1\.cpp: # 2a # GENERATED = `0`
+Generated_source1\.cpp: # 2b # GENERATED = `0`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `0`
 Generated_source2\.cpp: # 1b # GENERATED = `0`
 Generated_source2\.cpp: # 2a # GENERATED = `0`
 Generated_source2\.cpp: # 2b # GENERATED = `0`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `0`
 Generated_source3\.cpp: # 1b # GENERATED = `0`
 Generated_source3\.cpp: # 2a # GENERATED = `0`
 Generated_source3\.cpp: # 2b # GENERATED = `0`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `0`
 Generated_source5\.cpp: # 1b # GENERATED = `0`
 Generated_source5\.cpp: # 2a # GENERATED = `0`
 Generated_source5\.cpp: # 2b # GENERATED = `0`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `0`
 Generated_source6\.cpp: # 1b # GENERATED = `0`
 Generated_source6\.cpp: # 2a # GENERATED = `0`
 Generated_source6\.cpp: # 2b # GENERATED = `0`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test1-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test1-stderr.txt
index 9ae7eb2..bb19577 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test1-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test1-stderr.txt
@@ -1,4 +1,4 @@
-^prop: ``
+^prop: `0`
 CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-stderr.txt
index 118a6e6..f9ceb89 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-stderr.txt
@@ -2,44 +2,44 @@
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `1`
 Generated_source2\.cpp: # 1b # GENERATED = `1`
 Generated_source2\.cpp: # 2a # GENERATED = `1`
 Generated_source2\.cpp: # 2b # GENERATED = `1`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `1`
 Generated_source3\.cpp: # 1b # GENERATED = `1`
 Generated_source3\.cpp: # 2a # GENERATED = `1`
 Generated_source3\.cpp: # 2b # GENERATED = `1`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `1`
 Generated_source5\.cpp: # 1b # GENERATED = `1`
 Generated_source5\.cpp: # 2a # GENERATED = `1`
 Generated_source5\.cpp: # 2b # GENERATED = `1`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `1`
 Generated_source6\.cpp: # 1b # GENERATED = `1`
 Generated_source6\.cpp: # 2a # GENERATED = `1`
 Generated_source6\.cpp: # 2b # GENERATED = `1`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test10\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt
index 7c02091..0d4e924 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt
@@ -25,48 +25,48 @@ Generated_source0\.cpp: # 1a # GENERATED = `1`
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source2\.cpp: # 1a # GENERATED = `0`
-Generated_source2\.cpp: # 1b # GENERATED = `0`
-Generated_source2\.cpp: # 2a # GENERATED = `0`
-Generated_source2\.cpp: # 2b # GENERATED = `0`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source3\.cpp: # 1a # GENERATED = `0`
-Generated_source3\.cpp: # 1b # GENERATED = `0`
-Generated_source3\.cpp: # 2a # GENERATED = `0`
-Generated_source3\.cpp: # 2b # GENERATED = `0`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `0`
 Generated_source5\.cpp: # 1b # GENERATED = `0`
 Generated_source5\.cpp: # 2a # GENERATED = `0`
 Generated_source5\.cpp: # 2b # GENERATED = `0`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `0`
 Generated_source6\.cpp: # 1b # GENERATED = `0`
 Generated_source6\.cpp: # 2a # GENERATED = `0`
 Generated_source6\.cpp: # 2b # GENERATED = `0`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test11\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -74,7 +74,7 @@ Call Stack \(most recent call first\):
 CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test11\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -82,29 +82,13 @@ Call Stack \(most recent call first\):
 CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[2-6]\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-WARN-Test11\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)
-+
-CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
-  Cannot find source file:
-
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[2-6]\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-WARN-Test11\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)
-+
-CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
-  Cannot find source file:
-
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test11\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
 (CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_executable\):
-  No SOURCES given to target: executable[2-6]
+  No SOURCES given to target: executable[4-6]
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test11\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test12-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test12-stderr.txt
index 33b2c89..404787c 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test12-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test12-stderr.txt
@@ -11,41 +11,41 @@ Generated_source0\.cpp: # 1a # GENERATED = `1`
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `1`
 Generated_source2\.cpp: # 1b # GENERATED = `1`
 Generated_source2\.cpp: # 2a # GENERATED = `1`
 Generated_source2\.cpp: # 2b # GENERATED = `1`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `1`
 Generated_source3\.cpp: # 1b # GENERATED = `1`
 Generated_source3\.cpp: # 2a # GENERATED = `1`
 Generated_source3\.cpp: # 2b # GENERATED = `1`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `1`
 Generated_source5\.cpp: # 1b # GENERATED = `1`
 Generated_source5\.cpp: # 2a # GENERATED = `1`
 Generated_source5\.cpp: # 2b # GENERATED = `1`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `1`
 Generated_source6\.cpp: # 1b # GENERATED = `1`
 Generated_source6\.cpp: # 2a # GENERATED = `1`
 Generated_source6\.cpp: # 2b # GENERATED = `1`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`$
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt
index 2c5148e..cb31858 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt
@@ -34,41 +34,41 @@ Generated_source0\.cpp: # 1a # GENERATED = `1`
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source2\.cpp: # 1a # GENERATED = `0`
-Generated_source2\.cpp: # 1b # GENERATED = `0`
-Generated_source2\.cpp: # 2a # GENERATED = `0`
-Generated_source2\.cpp: # 2b # GENERATED = `0`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source3\.cpp: # 1a # GENERATED = `0`
-Generated_source3\.cpp: # 1b # GENERATED = `0`
-Generated_source3\.cpp: # 2a # GENERATED = `0`
-Generated_source3\.cpp: # 2b # GENERATED = `0`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `0`
 Generated_source5\.cpp: # 1b # GENERATED = `0`
 Generated_source5\.cpp: # 2a # GENERATED = `0`
 Generated_source5\.cpp: # 2b # GENERATED = `0`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `0`
 Generated_source6\.cpp: # 1b # GENERATED = `0`
 Generated_source6\.cpp: # 2a # GENERATED = `0`
 Generated_source6\.cpp: # 2b # GENERATED = `0`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`$
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-stderr.txt
index e76e48c..35f858c 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-stderr.txt
@@ -2,44 +2,44 @@
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `1`
 Generated_source2\.cpp: # 1b # GENERATED = `1`
 Generated_source2\.cpp: # 2a # GENERATED = `1`
 Generated_source2\.cpp: # 2b # GENERATED = `1`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `1`
 Generated_source3\.cpp: # 1b # GENERATED = `1`
 Generated_source3\.cpp: # 2a # GENERATED = `1`
 Generated_source3\.cpp: # 2b # GENERATED = `1`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `1`
 Generated_source5\.cpp: # 1b # GENERATED = `1`
 Generated_source5\.cpp: # 2a # GENERATED = `1`
 Generated_source5\.cpp: # 2b # GENERATED = `1`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `1`
 Generated_source6\.cpp: # 1b # GENERATED = `1`
 Generated_source6\.cpp: # 2a # GENERATED = `1`
 Generated_source6\.cpp: # 2b # GENERATED = `1`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test14\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt
index dc3e9d3..0b0e608 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt
@@ -25,48 +25,48 @@ Generated_source0\.cpp: # 1a # GENERATED = `1`
 Generated_source0\.cpp: # 1b # GENERATED = `1`
 Generated_source0\.cpp: # 2a # GENERATED = `1`
 Generated_source0\.cpp: # 2b # GENERATED = `1`
-Generated_source0\.cpp: # 3a # GENERATED = ``
-Generated_source0\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source0\.cpp: # 3a # GENERATED = `0`
+Generated_source0\.cpp: # 3b # GENERATED = `0`
 Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source2\.cpp: # 1a # GENERATED = `0`
-Generated_source2\.cpp: # 1b # GENERATED = `0`
-Generated_source2\.cpp: # 2a # GENERATED = `0`
-Generated_source2\.cpp: # 2b # GENERATED = `0`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source3\.cpp: # 1a # GENERATED = `0`
-Generated_source3\.cpp: # 1b # GENERATED = `0`
-Generated_source3\.cpp: # 2a # GENERATED = `0`
-Generated_source3\.cpp: # 2b # GENERATED = `0`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
+Generated_source2\.cpp: # 1a # GENERATED = `1`
+Generated_source2\.cpp: # 1b # GENERATED = `1`
+Generated_source2\.cpp: # 2a # GENERATED = `1`
+Generated_source2\.cpp: # 2b # GENERATED = `1`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
+Generated_source3\.cpp: # 1a # GENERATED = `1`
+Generated_source3\.cpp: # 1b # GENERATED = `1`
+Generated_source3\.cpp: # 2a # GENERATED = `1`
+Generated_source3\.cpp: # 2b # GENERATED = `1`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `0`
 Generated_source5\.cpp: # 1b # GENERATED = `0`
 Generated_source5\.cpp: # 2a # GENERATED = `0`
 Generated_source5\.cpp: # 2b # GENERATED = `0`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `0`
 Generated_source6\.cpp: # 1b # GENERATED = `0`
 Generated_source6\.cpp: # 2a # GENERATED = `0`
 Generated_source6\.cpp: # 2b # GENERATED = `0`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test15\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -74,7 +74,7 @@ Call Stack \(most recent call first\):
 CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test15\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
@@ -82,29 +82,13 @@ Call Stack \(most recent call first\):
 CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[2-6]\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-WARN-Test15\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)
-+
-CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
-  Cannot find source file:
-
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[2-6]\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-WARN-Test15\.cmake:[0-9]+ \(include\)
-  CMakeLists\.txt:[0-9]+ \(include\)
-+
-CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
-  Cannot find source file:
-
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[4-6]\.cpp
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test15\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
 (CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_executable\):
-  No SOURCES given to target: executable[2-6]
+  No SOURCES given to target: executable[4-6]
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test15\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3-stderr.txt
index ea32cbf..ca08216 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3-stderr.txt
@@ -2,34 +2,34 @@
 Generated_with_full_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 1a # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_relative_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_relative_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_relative_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_relative_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path3\.cpp: # 2b # GENERATED = `1`
 Generated_with_relative_path3\.cpp: # 3a # GENERATED = `1`
@@ -38,20 +38,20 @@ Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_source_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_source_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3b-stderr.txt
index c54a75f..ee4b71e 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3b-stderr.txt
@@ -2,34 +2,34 @@
 Generated_with_full_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 1a # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_relative_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_relative_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_relative_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_relative_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2a # GENERATED = `1`
 Generated_with_relative_path3\.cpp: # 2b # GENERATED = `1`
 Generated_with_relative_path3\.cpp: # 3a # GENERATED = `1`
@@ -38,20 +38,20 @@ Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_source_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `1`
 Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `1`
-Generated_with_full_source_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt
index e882b5c..5e8ecf5 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt
@@ -15,8 +15,8 @@ Generated_with_full_path1\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -34,8 +34,8 @@ Generated_with_full_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -49,12 +49,12 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_full_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -72,8 +72,8 @@ Generated_with_relative_path1\.cpp: # 1a # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_relative_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -91,8 +91,8 @@ Generated_with_relative_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_relative_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -106,8 +106,8 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_relative_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_relative_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 3a # GENERATED = `0`
@@ -129,8 +129,8 @@ Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_source_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -148,8 +148,8 @@ Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_source_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -163,12 +163,12 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_full_source_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt
index b3e27bf..7a685d1 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt
@@ -15,8 +15,8 @@ Generated_with_full_path1\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -34,8 +34,8 @@ Generated_with_full_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -49,12 +49,12 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_full_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -72,8 +72,8 @@ Generated_with_relative_path1\.cpp: # 1a # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_relative_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -91,8 +91,8 @@ Generated_with_relative_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_relative_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -106,8 +106,8 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_relative_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_relative_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2a # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 2b # GENERATED = `0`
 Generated_with_relative_path3\.cpp: # 3a # GENERATED = `0`
@@ -129,8 +129,8 @@ Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_source_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -148,8 +148,8 @@ Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `0`
 Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `0`
-Generated_with_full_source_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -163,12 +163,12 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_full_source_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt
index b6c5c3f..c258ba0 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt
@@ -1,9 +1,9 @@
-^Generated_with_full_path1\.cpp: # 1a # GENERATED = `tRue`
-Generated_with_full_path1\.cpp: # 1b # GENERATED = `tRue`
-Generated_with_full_path1\.cpp: # 2a # GENERATED = `tRue`
-Generated_with_full_path1\.cpp: # 2b # GENERATED = `tRue`
-Generated_with_full_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+^Generated_with_full_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path1\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -17,12 +17,12 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_full_path2\.cpp: # 1a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_path2\.cpp: # 1b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_path2\.cpp: # 2a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_path2\.cpp: # 2b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path2\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -44,18 +44,18 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_full_path3\.cpp: # 1a # GENERATED = `Junk-value`
-Generated_with_full_path3\.cpp: # 1b # GENERATED = `Junk-value`
-Generated_with_full_path3\.cpp: # 2a # GENERATED = `Junk-value`
-Generated_with_full_path3\.cpp: # 2b # GENERATED = `Junk-value`
-Generated_with_full_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_relative_path1\.cpp: # 1a # GENERATED = `tRue`
-Generated_with_relative_path1\.cpp: # 1b # GENERATED = `tRue`
-Generated_with_relative_path1\.cpp: # 2a # GENERATED = `tRue`
-Generated_with_relative_path1\.cpp: # 2b # GENERATED = `tRue`
-Generated_with_relative_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_path3\.cpp: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -69,12 +69,12 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_relative_path2\.cpp: # 1a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_relative_path2\.cpp: # 1b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_relative_path2\.cpp: # 2a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_relative_path2\.cpp: # 2b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_relative_path2\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -96,18 +96,18 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_relative_path3\.cpp: # 1a # GENERATED = `Junk-value`
-Generated_with_relative_path3\.cpp: # 1b # GENERATED = `Junk-value`
-Generated_with_relative_path3\.cpp: # 2a # GENERATED = `Junk-value`
-Generated_with_relative_path3\.cpp: # 2b # GENERATED = `Junk-value`
-Generated_with_relative_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_relative_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `tRue`
-Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `tRue`
-Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `tRue`
-Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `tRue`
-Generated_with_full_source_path1\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_relative_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.cpp: # 3b # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -121,12 +121,12 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_full_source_path2\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `SomeVar-NOTFOUND`
-Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `SomeVar-NOTFOUND`
+Generated_with_full_source_path2\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.cpp: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
   visible in all directories\.  Run "cmake --help-policy CMP0118" for policy
@@ -148,12 +148,12 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +
-Generated_with_full_source_path3\.cpp: # 1a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 2a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_with_full_source_path3\.cpp: # 3a # GENERATED = ``
-Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_with_full_source_path3\.cpp: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test6-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test6-stderr.txt
index b2d6109..25de751 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test6-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test6-stderr.txt
@@ -2,38 +2,38 @@
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `1`
 Generated_source2\.cpp: # 1b # GENERATED = `1`
 Generated_source2\.cpp: # 2a # GENERATED = `1`
 Generated_source2\.cpp: # 2b # GENERATED = `1`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `1`
 Generated_source3\.cpp: # 1b # GENERATED = `1`
 Generated_source3\.cpp: # 2a # GENERATED = `1`
 Generated_source3\.cpp: # 2b # GENERATED = `1`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `1`
 Generated_source5\.cpp: # 1b # GENERATED = `1`
 Generated_source5\.cpp: # 2a # GENERATED = `1`
 Generated_source5\.cpp: # 2b # GENERATED = `1`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `1`
 Generated_source6\.cpp: # 1b # GENERATED = `1`
 Generated_source6\.cpp: # 2a # GENERATED = `1`
 Generated_source6\.cpp: # 2b # GENERATED = `1`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test6\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt
index 90b332f..1d9ac49 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt
@@ -25,38 +25,38 @@ Generated_source1\.cpp: # 1a # GENERATED = `1`
 Generated_source1\.cpp: # 1b # GENERATED = `1`
 Generated_source1\.cpp: # 2a # GENERATED = `1`
 Generated_source1\.cpp: # 2b # GENERATED = `1`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `0`
 Generated_source2\.cpp: # 1b # GENERATED = `0`
 Generated_source2\.cpp: # 2a # GENERATED = `0`
 Generated_source2\.cpp: # 2b # GENERATED = `0`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `0`
 Generated_source3\.cpp: # 1b # GENERATED = `0`
 Generated_source3\.cpp: # 2a # GENERATED = `0`
 Generated_source3\.cpp: # 2b # GENERATED = `0`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `0`
 Generated_source5\.cpp: # 1b # GENERATED = `0`
 Generated_source5\.cpp: # 2a # GENERATED = `0`
 Generated_source5\.cpp: # 2b # GENERATED = `0`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `0`
 Generated_source6\.cpp: # 1b # GENERATED = `0`
 Generated_source6\.cpp: # 2a # GENERATED = `0`
 Generated_source6\.cpp: # 2b # GENERATED = `0`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test8-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test8-stderr.txt
index f67c1b9..5aaf6c6 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test8-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test8-stderr.txt
@@ -1,39 +1,39 @@
-^Generated_source1\.cpp: # 1a # GENERATED = ``
-Generated_source1\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source1\.cpp: # 2a # GENERATED = ``
-Generated_source1\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+^Generated_source1\.cpp: # 1a # GENERATED = `0`
+Generated_source1\.cpp: # 1b # GENERATED = `0`
+Generated_source1\.cpp: # 2a # GENERATED = `0`
+Generated_source1\.cpp: # 2b # GENERATED = `0`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `1`
 Generated_source2\.cpp: # 1b # GENERATED = `1`
 Generated_source2\.cpp: # 2a # GENERATED = `1`
 Generated_source2\.cpp: # 2b # GENERATED = `1`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `1`
 Generated_source3\.cpp: # 1b # GENERATED = `1`
 Generated_source3\.cpp: # 2a # GENERATED = `1`
 Generated_source3\.cpp: # 2b # GENERATED = `1`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `1`
 Generated_source5\.cpp: # 1b # GENERATED = `1`
 Generated_source5\.cpp: # 2a # GENERATED = `1`
 Generated_source5\.cpp: # 2b # GENERATED = `1`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `1`
 Generated_source6\.cpp: # 1b # GENERATED = `1`
 Generated_source6\.cpp: # 2a # GENERATED = `1`
 Generated_source6\.cpp: # 2b # GENERATED = `1`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test8\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt
index ccf706a..a4edec0 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt
@@ -21,42 +21,42 @@ Call Stack \(most recent call first\):
   CMakeLists\.txt:[0-9]+ \(include\)
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
 +)+)+
-Generated_source1\.cpp: # 1a # GENERATED = ``
-Generated_source1\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source1\.cpp: # 2a # GENERATED = ``
-Generated_source1\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source1\.cpp: # 3a # GENERATED = ``
-Generated_source1\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source1\.cpp: # 1a # GENERATED = `0`
+Generated_source1\.cpp: # 1b # GENERATED = `0`
+Generated_source1\.cpp: # 2a # GENERATED = `0`
+Generated_source1\.cpp: # 2b # GENERATED = `0`
+Generated_source1\.cpp: # 3a # GENERATED = `0`
+Generated_source1\.cpp: # 3b # GENERATED = `0`
 Generated_source2\.cpp: # 1a # GENERATED = `0`
 Generated_source2\.cpp: # 1b # GENERATED = `0`
 Generated_source2\.cpp: # 2a # GENERATED = `0`
 Generated_source2\.cpp: # 2b # GENERATED = `0`
-Generated_source2\.cpp: # 3a # GENERATED = ``
-Generated_source2\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source2\.cpp: # 3a # GENERATED = `0`
+Generated_source2\.cpp: # 3b # GENERATED = `0`
 Generated_source3\.cpp: # 1a # GENERATED = `0`
 Generated_source3\.cpp: # 1b # GENERATED = `0`
 Generated_source3\.cpp: # 2a # GENERATED = `0`
 Generated_source3\.cpp: # 2b # GENERATED = `0`
-Generated_source3\.cpp: # 3a # GENERATED = ``
-Generated_source3\.cpp: # 3b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 1a # GENERATED = ``
-Generated_source4\.cpp: # 1b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 2a # GENERATED = ``
-Generated_source4\.cpp: # 2b # GENERATED = `NOTFOUND`
-Generated_source4\.cpp: # 3a # GENERATED = ``
-Generated_source4\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source3\.cpp: # 3a # GENERATED = `0`
+Generated_source3\.cpp: # 3b # GENERATED = `0`
+Generated_source4\.cpp: # 1a # GENERATED = `0`
+Generated_source4\.cpp: # 1b # GENERATED = `0`
+Generated_source4\.cpp: # 2a # GENERATED = `0`
+Generated_source4\.cpp: # 2b # GENERATED = `0`
+Generated_source4\.cpp: # 3a # GENERATED = `0`
+Generated_source4\.cpp: # 3b # GENERATED = `0`
 Generated_source5\.cpp: # 1a # GENERATED = `0`
 Generated_source5\.cpp: # 1b # GENERATED = `0`
 Generated_source5\.cpp: # 2a # GENERATED = `0`
 Generated_source5\.cpp: # 2b # GENERATED = `0`
-Generated_source5\.cpp: # 3a # GENERATED = ``
-Generated_source5\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source5\.cpp: # 3a # GENERATED = `0`
+Generated_source5\.cpp: # 3b # GENERATED = `0`
 Generated_source6\.cpp: # 1a # GENERATED = `0`
 Generated_source6\.cpp: # 1b # GENERATED = `0`
 Generated_source6\.cpp: # 2a # GENERATED = `0`
 Generated_source6\.cpp: # 2b # GENERATED = `0`
-Generated_source6\.cpp: # 3a # GENERATED = ``
-Generated_source6\.cpp: # 3b # GENERATED = `NOTFOUND`
+Generated_source6\.cpp: # 3a # GENERATED = `0`
+Generated_source6\.cpp: # 3b # GENERATED = `0`
 CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_executable\):
   Cannot find source file:
 
diff --git a/Tests/RunCMake/CMP0118/RunCMakeTest.cmake b/Tests/RunCMake/CMP0118/RunCMakeTest.cmake
index a0177c7..72064bd 100644
--- a/Tests/RunCMake/CMP0118/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CMP0118/RunCMakeTest.cmake
@@ -35,3 +35,21 @@ run_cmake(CMP0118-WARN-Test12)
 run_cmake(CMP0118-WARN-Test13)
 run_cmake(CMP0118-WARN-Test14)
 run_cmake(CMP0118-WARN-Test15)
+
+run_cmake(CMP0118-NEW-Test1)
+run_cmake(CMP0118-NEW-Test2)
+run_cmake(CMP0118-NEW-Test3)
+run_cmake(CMP0118-NEW-Test3b)
+run_cmake(CMP0118-NEW-Test4)
+run_cmake(CMP0118-NEW-Test4b)
+run_cmake(CMP0118-NEW-Test5)
+run_cmake(CMP0118-NEW-Test6)
+run_cmake(CMP0118-NEW-Test7)
+run_cmake(CMP0118-NEW-Test8)
+run_cmake(CMP0118-NEW-Test9)
+run_cmake(CMP0118-NEW-Test10)
+run_cmake(CMP0118-NEW-Test11)
+run_cmake(CMP0118-NEW-Test12)
+run_cmake(CMP0118-NEW-Test13)
+run_cmake(CMP0118-NEW-Test14)
+run_cmake(CMP0118-NEW-Test15)