Tests: Avoid unnecessary use of toolchain in RunCMake.CMP0118

The semantics of the `GENERATED` property do not depend on the kind of
target to which the sources are attached.  Convert the tests to use
custom targets instead of executables so that we do not have to enable
the CXX language and initialize support of its toolchain for every case.
This significantly reduces the time the test takes to run.

76 files changed, 3007 insertions, 3259 deletions

diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test1.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test1.cmake
index fc4f5ec..2b66515 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test1.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test1.cmake
@@ -1,9 +1,9 @@
-add_executable(executable)
-target_sources(executable PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/GeneratedMain.cpp"
+add_custom_target(custom)
+target_sources(custom PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/GeneratedMain.txt"
 )
 
 get_property(prop SOURCE
-  "${CMAKE_CURRENT_BINARY_DIR}/GeneratedMain.cpp"
+  "${CMAKE_CURRENT_BINARY_DIR}/GeneratedMain.txt"
   PROPERTY GENERATED)
 message(NOTICE "prop: `${prop}`")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test10.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test10.cmake
index d0b2044..d060207 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test10.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test10.cmake
@@ -1,65 +1,65 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-# The sources of executable0 will not be modified by set_property!
-add_executable(executable0)
-target_sources(executable0 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+# The sources of custom0 will not be modified by set_property!
+add_custom_target(custom0)
+target_sources(custom0 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
-# The sources of executable[1-6] will (tried to) be modified by set_property!
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+# The sources of custom[1-6] will (tried to) be modified by set_property!
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
 )
 
 
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
 
 add_subdirectory(subdir-Common-Test10)
 
-get_and_print_GENERATED_property("Generated_source0.cpp")
-get_and_print_GENERATED_property("Generated_source1.cpp")
-get_and_print_GENERATED_property("Generated_source2.cpp")
-get_and_print_GENERATED_property("Generated_source3.cpp")
-get_and_print_GENERATED_property("Generated_source4.cpp")
-get_and_print_GENERATED_property("Generated_source5.cpp")
-get_and_print_GENERATED_property("Generated_source6.cpp")
+get_and_print_GENERATED_property("Generated_source0.txt")
+get_and_print_GENERATED_property("Generated_source1.txt")
+get_and_print_GENERATED_property("Generated_source2.txt")
+get_and_print_GENERATED_property("Generated_source3.txt")
+get_and_print_GENERATED_property("Generated_source4.txt")
+get_and_print_GENERATED_property("Generated_source5.txt")
+get_and_print_GENERATED_property("Generated_source6.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test11.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test11.cmake
index f21a7b1..00b204e 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test11.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test11.cmake
@@ -1,65 +1,65 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-# The sources of executable0 will not be modified by set_property!
-add_executable(executable0)
-target_sources(executable0 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+# The sources of custom0 will not be modified by set_property!
+add_custom_target(custom0)
+target_sources(custom0 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
-# The sources of executable[1-6] will (tried to) be modified by set_property!
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+# The sources of custom[1-6] will (tried to) be modified by set_property!
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
 )
 
 
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
 
 add_subdirectory(subdir-Common-Test11)
 
-get_and_print_GENERATED_property("Generated_source0.cpp")
-get_and_print_GENERATED_property("Generated_source1.cpp")
-get_and_print_GENERATED_property("Generated_source2.cpp")
-get_and_print_GENERATED_property("Generated_source3.cpp")
-get_and_print_GENERATED_property("Generated_source4.cpp")
-get_and_print_GENERATED_property("Generated_source5.cpp")
-get_and_print_GENERATED_property("Generated_source6.cpp")
+get_and_print_GENERATED_property("Generated_source0.txt")
+get_and_print_GENERATED_property("Generated_source1.txt")
+get_and_print_GENERATED_property("Generated_source2.txt")
+get_and_print_GENERATED_property("Generated_source3.txt")
+get_and_print_GENERATED_property("Generated_source4.txt")
+get_and_print_GENERATED_property("Generated_source5.txt")
+get_and_print_GENERATED_property("Generated_source6.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test12.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test12.cmake
index 280edca..1182d17 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test12.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test12.cmake
@@ -1,65 +1,65 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-# The sources of executable0 will not be modified by set_property!
-add_executable(executable0)
-target_sources(executable0 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+# The sources of custom0 will not be modified by set_property!
+add_custom_target(custom0)
+target_sources(custom0 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
-# The sources of executable[1-6] will (tried to) be modified by set_property!
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+# The sources of custom[1-6] will (tried to) be modified by set_property!
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
 )
 
 
-add_custom_command(TARGET executable0 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+add_custom_command(TARGET custom0 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
-add_custom_command(TARGET executable1 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+add_custom_command(TARGET custom1 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_custom_command(TARGET executable2 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_command(TARGET custom2 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_custom_command(TARGET executable3 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_command(TARGET custom3 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
 
 add_subdirectory(subdir-Common-Test12)
 
-get_and_print_GENERATED_property("Generated_source0.cpp")
-get_and_print_GENERATED_property("Generated_source1.cpp")
-get_and_print_GENERATED_property("Generated_source2.cpp")
-get_and_print_GENERATED_property("Generated_source3.cpp")
-get_and_print_GENERATED_property("Generated_source4.cpp")
-get_and_print_GENERATED_property("Generated_source5.cpp")
-get_and_print_GENERATED_property("Generated_source6.cpp")
+get_and_print_GENERATED_property("Generated_source0.txt")
+get_and_print_GENERATED_property("Generated_source1.txt")
+get_and_print_GENERATED_property("Generated_source2.txt")
+get_and_print_GENERATED_property("Generated_source3.txt")
+get_and_print_GENERATED_property("Generated_source4.txt")
+get_and_print_GENERATED_property("Generated_source5.txt")
+get_and_print_GENERATED_property("Generated_source6.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test13.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test13.cmake
index e1dfa11..12f4ac1 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test13.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test13.cmake
@@ -1,65 +1,65 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-# The sources of executable0 will not be modified by set_property!
-add_executable(executable0)
-target_sources(executable0 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+# The sources of custom0 will not be modified by set_property!
+add_custom_target(custom0)
+target_sources(custom0 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
-# The sources of executable[1-6] will (tried to) be modified by set_property!
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+# The sources of custom[1-6] will (tried to) be modified by set_property!
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
 )
 
 
-add_custom_command(TARGET executable0 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+add_custom_command(TARGET custom0 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
-add_custom_command(TARGET executable1 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+add_custom_command(TARGET custom1 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_custom_command(TARGET executable2 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_command(TARGET custom2 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_custom_command(TARGET executable3 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_command(TARGET custom3 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
 
 add_subdirectory(subdir-Common-Test13)
 
-get_and_print_GENERATED_property("Generated_source0.cpp")
-get_and_print_GENERATED_property("Generated_source1.cpp")
-get_and_print_GENERATED_property("Generated_source2.cpp")
-get_and_print_GENERATED_property("Generated_source3.cpp")
-get_and_print_GENERATED_property("Generated_source4.cpp")
-get_and_print_GENERATED_property("Generated_source5.cpp")
-get_and_print_GENERATED_property("Generated_source6.cpp")
+get_and_print_GENERATED_property("Generated_source0.txt")
+get_and_print_GENERATED_property("Generated_source1.txt")
+get_and_print_GENERATED_property("Generated_source2.txt")
+get_and_print_GENERATED_property("Generated_source3.txt")
+get_and_print_GENERATED_property("Generated_source4.txt")
+get_and_print_GENERATED_property("Generated_source5.txt")
+get_and_print_GENERATED_property("Generated_source6.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test14.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test14.cmake
index 5222353..30e3edc 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test14.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test14.cmake
@@ -1,65 +1,65 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-# The sources of executable0 will not be modified by set_property!
-add_executable(executable0)
-target_sources(executable0 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+# The sources of custom0 will not be modified by set_property!
+add_custom_target(custom0)
+target_sources(custom0 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
-# The sources of executable[1-6] will (tried to) be modified by set_property!
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+# The sources of custom[1-6] will (tried to) be modified by set_property!
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
 )
 
 
-add_custom_target(executable0_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+add_custom_target(custom0_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
-add_custom_target(executable1_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+add_custom_target(custom1_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_custom_target(executable2_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_custom_target(executable3_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
 
 add_subdirectory(subdir-Common-Test14)
 
-get_and_print_GENERATED_property("Generated_source0.cpp")
-get_and_print_GENERATED_property("Generated_source1.cpp")
-get_and_print_GENERATED_property("Generated_source2.cpp")
-get_and_print_GENERATED_property("Generated_source3.cpp")
-get_and_print_GENERATED_property("Generated_source4.cpp")
-get_and_print_GENERATED_property("Generated_source5.cpp")
-get_and_print_GENERATED_property("Generated_source6.cpp")
+get_and_print_GENERATED_property("Generated_source0.txt")
+get_and_print_GENERATED_property("Generated_source1.txt")
+get_and_print_GENERATED_property("Generated_source2.txt")
+get_and_print_GENERATED_property("Generated_source3.txt")
+get_and_print_GENERATED_property("Generated_source4.txt")
+get_and_print_GENERATED_property("Generated_source5.txt")
+get_and_print_GENERATED_property("Generated_source6.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test15.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test15.cmake
index c2c55af..fb05248 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test15.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test15.cmake
@@ -1,65 +1,65 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-# The sources of executable0 will not be modified by set_property!
-add_executable(executable0)
-target_sources(executable0 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+# The sources of custom0 will not be modified by set_property!
+add_custom_target(custom0)
+target_sources(custom0 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
-# The sources of executable[1-6] will (tried to) be modified by set_property!
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+# The sources of custom[1-6] will (tried to) be modified by set_property!
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
 )
 
 
-add_custom_target(executable0_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.cpp"
+add_custom_target(custom0_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source0.txt"
 )
-add_custom_target(executable1_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+add_custom_target(custom1_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_custom_target(executable2_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_custom_target(executable3_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
 
 add_subdirectory(subdir-Common-Test15)
 
-get_and_print_GENERATED_property("Generated_source0.cpp")
-get_and_print_GENERATED_property("Generated_source1.cpp")
-get_and_print_GENERATED_property("Generated_source2.cpp")
-get_and_print_GENERATED_property("Generated_source3.cpp")
-get_and_print_GENERATED_property("Generated_source4.cpp")
-get_and_print_GENERATED_property("Generated_source5.cpp")
-get_and_print_GENERATED_property("Generated_source6.cpp")
+get_and_print_GENERATED_property("Generated_source0.txt")
+get_and_print_GENERATED_property("Generated_source1.txt")
+get_and_print_GENERATED_property("Generated_source2.txt")
+get_and_print_GENERATED_property("Generated_source3.txt")
+get_and_print_GENERATED_property("Generated_source4.txt")
+get_and_print_GENERATED_property("Generated_source5.txt")
+get_and_print_GENERATED_property("Generated_source6.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test2.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test2.cmake
index feb66e3..1180b6b 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test2.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test2.cmake
@@ -1,12 +1,12 @@
-add_executable(executable)
-target_sources(executable PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/GeneratedMain.cpp"
+add_custom_target(custom)
+target_sources(custom PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/GeneratedMain.txt"
 )
 
 set_property(SOURCE
-  "${CMAKE_CURRENT_BINARY_DIR}/GeneratedMain.cpp"
+  "${CMAKE_CURRENT_BINARY_DIR}/GeneratedMain.txt"
   PROPERTY GENERATED "1")
 get_property(prop SOURCE
-  "${CMAKE_CURRENT_BINARY_DIR}/GeneratedMain.cpp"
+  "${CMAKE_CURRENT_BINARY_DIR}/GeneratedMain.txt"
   PROPERTY GENERATED)
 message(NOTICE "prop: `${prop}`")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test3.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test3.cmake
index b12834d..27516b7 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test3.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test3.cmake
@@ -1,66 +1,66 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.cpp"
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.txt"
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.txt"
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "Generated_with_relative_path1.cpp"
-  "Generated_with_relative_path2.cpp"
-  "Generated_with_relative_path3.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "Generated_with_relative_path1.txt"
+  "Generated_with_relative_path2.txt"
+  "Generated_with_relative_path3.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path1.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path1.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path3.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path3.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path1.txt")
 
-set_property(SOURCE "Generated_with_full_path2.cpp"
+set_property(SOURCE "Generated_with_full_path2.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path2.txt")
 
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_path3.cpp"
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_path3.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path3.txt")
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_relative_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_relative_path1.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_relative_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path1.txt")
 
-set_property(SOURCE "Generated_with_relative_path2.cpp"
+set_property(SOURCE "Generated_with_relative_path2.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_relative_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path2.txt")
 
-set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_relative_path3.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_relative_path3.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_relative_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path3.txt")
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_source_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_source_path1.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_source_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path1.txt")
 
-set_property(SOURCE "Generated_with_full_source_path2.cpp"
+set_property(SOURCE "Generated_with_full_source_path2.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_source_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path2.txt")
 
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_source_path3.cpp"
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_source_path3.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_source_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path3.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test3b.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test3b.cmake
index 3e4a280..3e03a1f 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test3b.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test3b.cmake
@@ -1,66 +1,66 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path1.txt")
 
-set_property(SOURCE "Generated_with_full_path2.cpp"
+set_property(SOURCE "Generated_with_full_path2.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path2.txt")
 
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_path3.cpp"
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_path3.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path3.txt")
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_relative_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_relative_path1.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_relative_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path1.txt")
 
-set_property(SOURCE "Generated_with_relative_path2.cpp"
+set_property(SOURCE "Generated_with_relative_path2.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_relative_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path2.txt")
 
-set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_relative_path3.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_relative_path3.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_relative_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path3.txt")
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_source_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_source_path1.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_source_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path1.txt")
 
-set_property(SOURCE "Generated_with_full_source_path2.cpp"
+set_property(SOURCE "Generated_with_full_source_path2.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_source_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path2.txt")
 
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_source_path3.cpp"
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_source_path3.txt"
   PROPERTY GENERATED "1")
-get_and_print_GENERATED_property("Generated_with_full_source_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path3.txt")
 
 
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.cpp"
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.txt"
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.txt"
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "Generated_with_relative_path1.cpp"
-  "Generated_with_relative_path2.cpp"
-  "Generated_with_relative_path3.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "Generated_with_relative_path1.txt"
+  "Generated_with_relative_path2.txt"
+  "Generated_with_relative_path3.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path1.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path1.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path3.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path3.txt"
 )
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test4.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test4.cmake
index 81f1254..953e26a 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test4.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test4.cmake
@@ -1,66 +1,66 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.cpp"
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.txt"
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.txt"
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "Generated_with_relative_path1.cpp"
-  "Generated_with_relative_path2.cpp"
-  "Generated_with_relative_path3.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "Generated_with_relative_path1.txt"
+  "Generated_with_relative_path2.txt"
+  "Generated_with_relative_path3.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path1.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path1.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path3.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path3.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path1.txt")
 
-set_property(SOURCE "Generated_with_full_path2.cpp"
+set_property(SOURCE "Generated_with_full_path2.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path2.txt")
 
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_path3.cpp"
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_path3.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path3.txt")
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_relative_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_relative_path1.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_relative_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path1.txt")
 
-set_property(SOURCE "Generated_with_relative_path2.cpp"
+set_property(SOURCE "Generated_with_relative_path2.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_relative_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path2.txt")
 
-set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_relative_path3.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_relative_path3.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_relative_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path3.txt")
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_source_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_source_path1.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_source_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path1.txt")
 
-set_property(SOURCE "Generated_with_full_source_path2.cpp"
+set_property(SOURCE "Generated_with_full_source_path2.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_source_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path2.txt")
 
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_source_path3.cpp"
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_source_path3.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_source_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path3.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test4b.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test4b.cmake
index 439f456..025caa8 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test4b.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test4b.cmake
@@ -1,66 +1,66 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path1.txt")
 
-set_property(SOURCE "Generated_with_full_path2.cpp"
+set_property(SOURCE "Generated_with_full_path2.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path2.txt")
 
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_path3.cpp"
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_path3.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path3.txt")
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_relative_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_relative_path1.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_relative_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path1.txt")
 
-set_property(SOURCE "Generated_with_relative_path2.cpp"
+set_property(SOURCE "Generated_with_relative_path2.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_relative_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path2.txt")
 
-set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_relative_path3.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_relative_path3.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_relative_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path3.txt")
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_source_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_source_path1.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_source_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path1.txt")
 
-set_property(SOURCE "Generated_with_full_source_path2.cpp"
+set_property(SOURCE "Generated_with_full_source_path2.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_source_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path2.txt")
 
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_source_path3.cpp"
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_source_path3.txt"
   PROPERTY GENERATED "0")
-get_and_print_GENERATED_property("Generated_with_full_source_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path3.txt")
 
 
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.cpp"
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.cpp"
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.txt"
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.txt"
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "Generated_with_relative_path1.cpp"
-  "Generated_with_relative_path2.cpp"
-  "Generated_with_relative_path3.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "Generated_with_relative_path1.txt"
+  "Generated_with_relative_path2.txt"
+  "Generated_with_relative_path3.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path1.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path1.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path3.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path3.txt"
 )
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test5.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test5.cmake
index 1bf9aaa..5349bff 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test5.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test5.cmake
@@ -1,78 +1,78 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.cpp"
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "Generated_with_relative_path1.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "Generated_with_relative_path1.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "Generated_with_relative_path2.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "Generated_with_relative_path2.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "Generated_with_relative_path3.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "Generated_with_relative_path3.txt"
 )
-add_executable(executable7)
-target_sources(executable7 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path1.cpp"
+add_custom_target(custom7)
+target_sources(custom7 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path1.txt"
 )
-add_executable(executable8)
-target_sources(executable8 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.cpp"
+add_custom_target(custom8)
+target_sources(custom8 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.txt"
 )
-add_executable(executable9)
-target_sources(executable9 PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path3.cpp"
+add_custom_target(custom9)
+target_sources(custom9 PRIVATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path3.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path1.txt"
   PROPERTY GENERATED "tRue")
-get_and_print_GENERATED_property("Generated_with_full_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path1.txt")
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path2.txt"
   PROPERTY GENERATED "SomeVar-NOTFOUND")
-get_and_print_GENERATED_property("Generated_with_full_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path2.txt")
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_path3.txt"
   PROPERTY GENERATED "Junk-value")
-get_and_print_GENERATED_property("Generated_with_full_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_full_path3.txt")
 
 
-set_property(SOURCE "Generated_with_relative_path1.cpp"
+set_property(SOURCE "Generated_with_relative_path1.txt"
   PROPERTY GENERATED "tRue")
-get_and_print_GENERATED_property("Generated_with_relative_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path1.txt")
 
-set_property(SOURCE "Generated_with_relative_path2.cpp"
+set_property(SOURCE "Generated_with_relative_path2.txt"
   PROPERTY GENERATED "SomeVar-NOTFOUND")
-get_and_print_GENERATED_property("Generated_with_relative_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path2.txt")
 
-set_property(SOURCE "Generated_with_relative_path3.cpp"
+set_property(SOURCE "Generated_with_relative_path3.txt"
   PROPERTY GENERATED "Junk-value")
-get_and_print_GENERATED_property("Generated_with_relative_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_relative_path3.txt")
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_source_path1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_with_full_source_path1.txt"
   PROPERTY GENERATED "tRue")
-get_and_print_GENERATED_property("Generated_with_full_source_path1.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path1.txt")
 
-set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/Generated_with_full_source_path2.txt"
   PROPERTY GENERATED "SomeVar-NOTFOUND")
-get_and_print_GENERATED_property("Generated_with_full_source_path2.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path2.txt")
 
-set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_source_path3.cpp"
+set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/"Generated_with_full_source_path3.txt"
   PROPERTY GENERATED "Junk-value")
-get_and_print_GENERATED_property("Generated_with_full_source_path3.cpp")
+get_and_print_GENERATED_property("Generated_with_full_source_path3.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test6.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test6.cmake
index 7715e78..a6f28aa 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test6.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test6.cmake
@@ -1,44 +1,44 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
   PROPERTY GENERATED "1")
 
 add_subdirectory(subdir-Common-Test6)
 
-get_and_print_GENERATED_property("Generated_source1.cpp")
-get_and_print_GENERATED_property("Generated_source2.cpp")
-get_and_print_GENERATED_property("Generated_source3.cpp")
-get_and_print_GENERATED_property("Generated_source4.cpp")
-get_and_print_GENERATED_property("Generated_source5.cpp")
-get_and_print_GENERATED_property("Generated_source6.cpp")
+get_and_print_GENERATED_property("Generated_source1.txt")
+get_and_print_GENERATED_property("Generated_source2.txt")
+get_and_print_GENERATED_property("Generated_source3.txt")
+get_and_print_GENERATED_property("Generated_source4.txt")
+get_and_print_GENERATED_property("Generated_source5.txt")
+get_and_print_GENERATED_property("Generated_source6.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test7.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test7.cmake
index 96bb590..eed49b8 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test7.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test7.cmake
@@ -1,44 +1,44 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
   PROPERTY GENERATED "1")
 
 add_subdirectory(subdir-Common-Test7)
 
-get_and_print_GENERATED_property("Generated_source1.cpp")
-get_and_print_GENERATED_property("Generated_source2.cpp")
-get_and_print_GENERATED_property("Generated_source3.cpp")
-get_and_print_GENERATED_property("Generated_source4.cpp")
-get_and_print_GENERATED_property("Generated_source5.cpp")
-get_and_print_GENERATED_property("Generated_source6.cpp")
+get_and_print_GENERATED_property("Generated_source1.txt")
+get_and_print_GENERATED_property("Generated_source2.txt")
+get_and_print_GENERATED_property("Generated_source3.txt")
+get_and_print_GENERATED_property("Generated_source4.txt")
+get_and_print_GENERATED_property("Generated_source5.txt")
+get_and_print_GENERATED_property("Generated_source6.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test8.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test8.cmake
index 2c87b65..5cc6e99 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test8.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test8.cmake
@@ -1,50 +1,50 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
 )
 
 
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 
 add_subdirectory(subdir-Common-Test8)
 
-get_and_print_GENERATED_property("Generated_source1.cpp")
-get_and_print_GENERATED_property("Generated_source2.cpp")
-get_and_print_GENERATED_property("Generated_source3.cpp")
-get_and_print_GENERATED_property("Generated_source4.cpp")
-get_and_print_GENERATED_property("Generated_source5.cpp")
-get_and_print_GENERATED_property("Generated_source6.cpp")
+get_and_print_GENERATED_property("Generated_source1.txt")
+get_and_print_GENERATED_property("Generated_source2.txt")
+get_and_print_GENERATED_property("Generated_source3.txt")
+get_and_print_GENERATED_property("Generated_source4.txt")
+get_and_print_GENERATED_property("Generated_source5.txt")
+get_and_print_GENERATED_property("Generated_source6.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-Common-Test9.cmake b/Tests/RunCMake/CMP0118/CMP0118-Common-Test9.cmake
index e302f5c..b7d36ef 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-Common-Test9.cmake
+++ b/Tests/RunCMake/CMP0118/CMP0118-Common-Test9.cmake
@@ -1,50 +1,50 @@
 include(${CMAKE_CURRENT_LIST_DIR}/CMP0118-Common-Helper.cmake)
 
 
-add_executable(executable1)
-target_sources(executable1 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+add_custom_target(custom1)
+target_sources(custom1 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
 )
-add_executable(executable2)
-target_sources(executable2 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+add_custom_target(custom2)
+target_sources(custom2 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
 )
-add_executable(executable3)
-target_sources(executable3 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+add_custom_target(custom3)
+target_sources(custom3 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
 )
-add_executable(executable4)
-target_sources(executable4 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+add_custom_target(custom4)
+target_sources(custom4 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
 )
-add_executable(executable5)
-target_sources(executable5 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+add_custom_target(custom5)
+target_sources(custom5 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
 )
-add_executable(executable6)
-target_sources(executable6 PRIVATE
-  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+add_custom_target(custom6)
+target_sources(custom6 PRIVATE
+  "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
 )
 
 
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source1.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source2.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source3.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 
 add_subdirectory(subdir-Common-Test9)
 
-get_and_print_GENERATED_property("Generated_source1.cpp")
-get_and_print_GENERATED_property("Generated_source2.cpp")
-get_and_print_GENERATED_property("Generated_source3.cpp")
-get_and_print_GENERATED_property("Generated_source4.cpp")
-get_and_print_GENERATED_property("Generated_source5.cpp")
-get_and_print_GENERATED_property("Generated_source6.cpp")
+get_and_print_GENERATED_property("Generated_source1.txt")
+get_and_print_GENERATED_property("Generated_source2.txt")
+get_and_print_GENERATED_property("Generated_source3.txt")
+get_and_print_GENERATED_property("Generated_source4.txt")
+get_and_print_GENERATED_property("Generated_source5.txt")
+get_and_print_GENERATED_property("Generated_source6.txt")
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-stderr.txt
index 85ff65c..ec777f7 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-stderr.txt
@@ -1,14 +1,8 @@
 ^prop: `0`
-CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(add_custom_target\):
   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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-build/GeneratedMain\.txt
 Call Stack \(most recent call first\):
   CMP0118-NEW-Test1\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-stderr.txt
index 024d263..cee4516 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-stderr.txt
@@ -1,55 +1,49 @@
-^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\):
+^Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test10\.cmake:[0-9]+ \(add_custom_target\):
   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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-NEW-Test10\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-stderr.txt
index 7e660ad..422a3de 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-stderr.txt
@@ -11,76 +11,70 @@ Call Stack \(most recent call first\):
   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\):
+Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-build/Generated_source[4-6]\.txt
 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-Test12-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12-stderr.txt
index 404787c..e6c429c 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test12-stderr.txt
@@ -1,51 +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\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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`$
+Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-stderr.txt
index 92ac33e..7802538 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-stderr.txt
@@ -1,11 +1,11 @@
 ^CMake Error at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
-  TARGET 'executable[4-6]' was not created in this directory\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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!
@@ -20,45 +20,45 @@ Call Stack \(most recent call first\):
   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`$
+Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-stderr.txt
index cd14945..2f42f36 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-stderr.txt
@@ -1,55 +1,49 @@
-^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\):
+^Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test14\.cmake:[0-9]+ \(add_custom_target\):
   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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-NEW-Test14\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-stderr.txt
index 6c66392..65bd577 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-stderr.txt
@@ -11,76 +11,70 @@ Call Stack \(most recent call first\):
   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\):
+Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-build/Generated_source[4-6]\.txt
 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-Test3-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3-stderr.txt
index 4002989..f7d9f6b 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3-stderr.txt
@@ -1,93 +1,87 @@
-^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\):
+^Generated_with_full_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test3-build/Generated_with_full_path3\.txt)
 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\):
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test3-build/Generated_with_full_path3\.txt)
 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\):
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test3-build/Generated_with_full_path3\.txt)
 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\):
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test3-build/Generated_with_full_path3\.txt)
 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-Test3b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b-stderr.txt
index 21177bc..a876390 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b-stderr.txt
@@ -1,93 +1,87 @@
-^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\):
+^Generated_with_full_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test3b-build/Generated_with_full_path3\.txt)
 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\):
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test3b-build/Generated_with_full_path3\.txt)
 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\):
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test3b-build/Generated_with_full_path3\.txt)
 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\):
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test3b-build/Generated_with_full_path3\.txt)
 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-Test4-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4-stderr.txt
index 42c19a5..b750ae7 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4-stderr.txt
@@ -6,12 +6,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_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`
+Generated_with_full_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -20,12 +20,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -34,12 +34,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 = `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_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -48,12 +48,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_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`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -62,12 +62,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -76,12 +76,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_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_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -90,12 +90,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_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`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -104,12 +104,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -118,56 +118,50 @@ 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 = `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\):
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test4-build/Generated_with_full_path1\.txt|CMP0118-NEW-Test4-build/Generated_with_relative_path1\.txt)
 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\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test4-build/Generated_with_full_path1\.txt|CMP0118-NEW-Test4-build/Generated_with_relative_path1\.txt)
 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\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test4-build/Generated_with_full_path1\.txt|CMP0118-NEW-Test4-build/Generated_with_relative_path1\.txt)
 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\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test4-build/Generated_with_full_path1\.txt|CMP0118-NEW-Test4-build/Generated_with_relative_path1\.txt)
 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\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test4-build/Generated_with_full_path1\.txt|CMP0118-NEW-Test4-build/Generated_with_relative_path1\.txt)
 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-Test4b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b-stderr.txt
index 58f8d89..580f04f 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b-stderr.txt
@@ -6,12 +6,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_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`
+Generated_with_full_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -20,12 +20,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -34,12 +34,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 = `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_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -48,12 +48,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_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`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -62,12 +62,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -76,12 +76,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_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_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -90,12 +90,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_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`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -104,12 +104,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test4b\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -118,56 +118,50 @@ 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 = `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\):
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test4b-build/Generated_with_full_path1\.txt|CMP0118-NEW-Test4b-build/Generated_with_relative_path1\.txt)
 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\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test4b-build/Generated_with_full_path1\.txt|CMP0118-NEW-Test4b-build/Generated_with_relative_path1\.txt)
 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\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test4b-build/Generated_with_full_path1\.txt|CMP0118-NEW-Test4b-build/Generated_with_relative_path1\.txt)
 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\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test4b-build/Generated_with_full_path1\.txt|CMP0118-NEW-Test4b-build/Generated_with_relative_path1\.txt)
 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\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test4b-build/Generated_with_full_path1\.txt|CMP0118-NEW-Test4b-build/Generated_with_relative_path1\.txt)
 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-Test5-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5-stderr.txt
index 0d26a57..e268a7a 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test5-stderr.txt
@@ -1,9 +1,9 @@
-^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_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -12,12 +12,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 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:
@@ -31,18 +31,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 = `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_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -51,12 +51,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 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:
@@ -70,18 +70,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 = `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_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
 CMake Warning \(dev\) at CMP0118-Common-Test5\.cmake:[0-9]+ \(set_property\):
   Unsetting the 'GENERATED' property is not allowed under CMP0118!
 
@@ -90,12 +90,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 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:
@@ -109,72 +109,66 @@ 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 = `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\):
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.txt)
 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\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.txt)
 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\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.txt)
 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\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.txt)
 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\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.txt)
 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\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.txt)
 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\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   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)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-NEW-Test5-build/Generated_with_full_path[2-3]\.txt)
 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-Test6-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-stderr.txt
index c3fdd96..17e2b4a 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-stderr.txt
@@ -1,49 +1,43 @@
-^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\):
+^Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test6\.cmake:[0-9]+ \(add_custom_target\):
   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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-NEW-Test6\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-stderr.txt
index 4c2a2ae..08eb682 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-stderr.txt
@@ -11,70 +11,64 @@ 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 = `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\):
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-build/Generated_source[4-6]\.txt
 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-Test8-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-stderr.txt
index 44f94d4..7f48bf0 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-stderr.txt
@@ -1,49 +1,43 @@
-^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\):
+^Generated_source1\.txt: # 1a # GENERATED = `0`
+Generated_source1\.txt: # 1b # GENERATED = `0`
+Generated_source1\.txt: # 2a # GENERATED = `0`
+Generated_source1\.txt: # 2b # GENERATED = `0`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test8\.cmake:[0-9]+ \(add_custom_target\):
   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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-NEW-Test8\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-stderr.txt
index 53e1399..b7c496c 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-stderr.txt
@@ -11,70 +11,64 @@ 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 = `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\):
+Generated_source1\.txt: # 1a # GENERATED = `0`
+Generated_source1\.txt: # 1b # GENERATED = `0`
+Generated_source1\.txt: # 2a # GENERATED = `0`
+Generated_source1\.txt: # 2b # GENERATED = `0`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `0`
+Generated_source2\.txt: # 1b # GENERATED = `0`
+Generated_source2\.txt: # 2a # GENERATED = `0`
+Generated_source2\.txt: # 2b # GENERATED = `0`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `0`
+Generated_source3\.txt: # 1b # GENERATED = `0`
+Generated_source3\.txt: # 2a # GENERATED = `0`
+Generated_source3\.txt: # 2b # GENERATED = `0`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-build/Generated_source[4-6]\.txt
 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-OLD-Test1-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt
index 491489d..58144c8 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt
@@ -1,14 +1,8 @@
 ^prop: `0`
-CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-build/GeneratedMain\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-OLD-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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-build/GeneratedMain\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test1\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt
index 12dd48f..1f1bc90 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt
@@ -1,55 +1,49 @@
-^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\):
+^Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test10\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-build/Generated_source4\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-OLD-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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test10\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt
index 91db26a..5c15f12 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt
@@ -1,73 +1,67 @@
-^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\):
+^Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-build/Generated_source[4-6]\.txt
 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[4-6]
-Call Stack \(most recent call first\):
-  CMP0118-OLD-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-OLD-Test12-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt
index 404787c..e6c429c 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt
@@ -1,51 +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\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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`$
+Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt
index 07f2f10..75dbf23 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt
@@ -1,51 +1,51 @@
 ^CMake Error at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
-  TARGET 'executable[4-6]' was not created in this directory\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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 = `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`$
+Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt
index 395637a..12a913a 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt
@@ -1,55 +1,49 @@
-^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\):
+^Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test14\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-build/Generated_source4\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-OLD-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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test14\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt
index d6799b4..62db7ee 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt
@@ -1,73 +1,67 @@
-^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\):
+^Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-build/Generated_source[4-6]\.txt
 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[4-6]
-Call Stack \(most recent call first\):
-  CMP0118-OLD-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-OLD-Test3-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt
index 4764494..7f86d38 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt
@@ -1,93 +1,87 @@
-^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\):
+^Generated_with_full_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test3-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test3-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test3\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test3-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test3-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test3\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test3-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test3-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test3\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test3-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test3-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-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-OLD-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-OLD-Test3b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt
index 33c4375..4104fc0 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt
@@ -1,93 +1,87 @@
-^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\):
+^Generated_with_full_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test3b-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test3b-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test3b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test3b-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test3b-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test3b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test3b-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test3b-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test3b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test3b-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test3b-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-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-OLD-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-OLD-Test4-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt
index 1723ece..7a16d0b 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt
@@ -1,101 +1,95 @@
-^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`
-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 = `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`
-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 = `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`
-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-Test4\.cmake:[0-9]+ \(add_executable\):
+^Generated_with_full_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test4-build/Generated_with_full_path1\.cpp|CMP0118-OLD-Test4-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test4-build/Generated_with_full_path1\.txt|CMP0118-OLD-Test4-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test4\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test4-build/Generated_with_full_path1\.cpp|CMP0118-OLD-Test4-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test4-build/Generated_with_full_path1\.txt|CMP0118-OLD-Test4-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test4\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test4-build/Generated_with_full_path1\.cpp|CMP0118-OLD-Test4-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test4-build/Generated_with_full_path1\.txt|CMP0118-OLD-Test4-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test4\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test4-build/Generated_with_full_path1\.cpp|CMP0118-OLD-Test4-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test4-build/Generated_with_full_path1\.txt|CMP0118-OLD-Test4-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test4\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test4-build/Generated_with_full_path1\.cpp|CMP0118-OLD-Test4-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test4-build/Generated_with_full_path1\.txt|CMP0118-OLD-Test4-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-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-OLD-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-OLD-Test4b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt
index b7b37e9..5a5c4ec 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt
@@ -1,101 +1,95 @@
-^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`
-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 = `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`
-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 = `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`
-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-Test4b\.cmake:[0-9]+ \(add_executable\):
+^Generated_with_full_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-OLD-Test4b-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test4b-build/Generated_with_full_path1\.txt|CMP0118-OLD-Test4b-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test4b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-OLD-Test4b-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test4b-build/Generated_with_full_path1\.txt|CMP0118-OLD-Test4b-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test4b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-OLD-Test4b-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test4b-build/Generated_with_full_path1\.txt|CMP0118-OLD-Test4b-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test4b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-OLD-Test4b-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test4b-build/Generated_with_full_path1\.txt|CMP0118-OLD-Test4b-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test4b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-OLD-Test4b-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test4b-build/Generated_with_full_path1\.txt|CMP0118-OLD-Test4b-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-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-OLD-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-OLD-Test5-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt
index 3ad00b7..12fa617 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt
@@ -1,117 +1,111 @@
-^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\):
+^Generated_with_full_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-OLD-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-OLD-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-OLD-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-OLD-Test6-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt
index 475c559..7199f04 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt
@@ -1,49 +1,43 @@
-^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\):
+^Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test6\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-build/Generated_source4\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-OLD-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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test6\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt
index 5f490ee..233fd8b 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt
@@ -1,83 +1,77 @@
-^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 = `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-Test7\.cmake:[0-9]+ \(add_executable\):
+^Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `0`
+Generated_source2\.txt: # 1b # GENERATED = `0`
+Generated_source2\.txt: # 2a # GENERATED = `0`
+Generated_source2\.txt: # 2b # GENERATED = `0`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `0`
+Generated_source3\.txt: # 1b # GENERATED = `0`
+Generated_source3\.txt: # 2a # GENERATED = `0`
+Generated_source3\.txt: # 2b # GENERATED = `0`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-build/Generated_source[2-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test7\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-build/Generated_source[2-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test7\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-build/Generated_source[2-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test7\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-build/Generated_source[2-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test7\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-build/Generated_source[2-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-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[2-6]
-Call Stack \(most recent call first\):
-  CMP0118-OLD-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-OLD-Test8-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt
index bd82224..4aed2ed 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt
@@ -1,49 +1,43 @@
-^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\):
+^Generated_source1\.txt: # 1a # GENERATED = `0`
+Generated_source1\.txt: # 1b # GENERATED = `0`
+Generated_source1\.txt: # 2a # GENERATED = `0`
+Generated_source1\.txt: # 2b # GENERATED = `0`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test8\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-build/Generated_source4\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-OLD-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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test8\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt
index 172e4eb..cea8c22 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt
@@ -1,67 +1,61 @@
-^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\):
+^Generated_source1\.txt: # 1a # GENERATED = `0`
+Generated_source1\.txt: # 1b # GENERATED = `0`
+Generated_source1\.txt: # 2a # GENERATED = `0`
+Generated_source1\.txt: # 2b # GENERATED = `0`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `0`
+Generated_source2\.txt: # 1b # GENERATED = `0`
+Generated_source2\.txt: # 2a # GENERATED = `0`
+Generated_source2\.txt: # 2b # GENERATED = `0`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `0`
+Generated_source3\.txt: # 1b # GENERATED = `0`
+Generated_source3\.txt: # 2a # GENERATED = `0`
+Generated_source3\.txt: # 2b # GENERATED = `0`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-build/Generated_source[4-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test9\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-build/Generated_source[4-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-Test9\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-build/Generated_source[4-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-OLD-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-OLD-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-WARN-Test1-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test1-stderr.txt
index bb19577..e2a2cf5 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test1-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test1-stderr.txt
@@ -1,14 +1,8 @@
 ^prop: `0`
-CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test1\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test1-build/GeneratedMain\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-WARN-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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test1-build/GeneratedMain\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test1\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-stderr.txt
index f9ceb89..bce7681 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-stderr.txt
@@ -1,55 +1,49 @@
-^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\):
+^Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test10\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-build/Generated_source4\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-WARN-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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test10\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt
index 0d4e924..00c47e9 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt
@@ -21,76 +21,70 @@ Call Stack \(most recent call first\):
   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\):
+Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test11\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-build/Generated_source[4-6]\.txt
 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[4-6]
-Call Stack \(most recent call first\):
-  CMP0118-WARN-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-WARN-Test12-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test12-stderr.txt
index 404787c..e6c429c 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test12-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test12-stderr.txt
@@ -1,51 +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\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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`$
+Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt
index cb31858..6d59cb4 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt
@@ -1,11 +1,11 @@
 ^CMake Error at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(add_custom_command\):
-  TARGET 'executable[4-6]' was not created in this directory\.
+  TARGET 'custom[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\.
+  TARGET 'custom[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\.
+  TARGET 'custom[4-6]' was not created in this directory\.
 +
 ((CMake Warning \(dev\) at subdir-Common-Test13/CMakeLists\.txt:[0-9]+ \(set_property\):
   Policy CMP0118 is not set: The GENERATED source file property is now
@@ -30,45 +30,45 @@ Call Stack \(most recent call first\):
   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`$
+Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`$
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-stderr.txt
index 35f858c..5b7994c 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-stderr.txt
@@ -1,55 +1,49 @@
-^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\):
+^Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test14\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-build/Generated_source4\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-WARN-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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test14\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt
index 0b0e608..c975c23 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt
@@ -21,76 +21,70 @@ Call Stack \(most recent call first\):
   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\):
+Generated_source0\.txt: # 1a # GENERATED = `1`
+Generated_source0\.txt: # 1b # GENERATED = `1`
+Generated_source0\.txt: # 2a # GENERATED = `1`
+Generated_source0\.txt: # 2b # GENERATED = `1`
+Generated_source0\.txt: # 3a # GENERATED = `0`
+Generated_source0\.txt: # 3b # GENERATED = `0`
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[4-6]\.txt
 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\):
+CMake Error at CMP0118-Common-Test15\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-build/Generated_source[4-6]\.txt
 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[4-6]
-Call Stack \(most recent call first\):
-  CMP0118-WARN-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-WARN-Test3-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3-stderr.txt
index ca08216..142d8a0 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3-stderr.txt
@@ -1,93 +1,87 @@
-^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\):
+^Generated_with_full_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test3-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test3-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test3\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test3-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test3-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test3\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test3-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test3-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test3\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test3-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test3-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-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-WARN-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-WARN-Test3b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3b-stderr.txt
index ee4b71e..d4ef667 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test3b-stderr.txt
@@ -1,93 +1,87 @@
-^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\):
+^Generated_with_full_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `1`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test3b-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test3b-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test3b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test3b-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test3b-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test3b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test3b-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test3b-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test3b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test3b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test3b-build/Generated_with_full_path3\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test3b-build/Generated_with_full_path3\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-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-WARN-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-WARN-Test4-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt
index 5e8ecf5..ceeb570 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt
@@ -11,12 +11,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_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`
+Generated_with_full_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 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
@@ -30,12 +30,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 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 = `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_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 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
@@ -68,12 +68,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_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`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 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
@@ -87,12 +87,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 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,12 +106,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_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_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 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
@@ -125,12 +125,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_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`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 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
@@ -144,12 +144,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 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,56 +163,50 @@ 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 = `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\):
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test4-build/Generated_with_full_path1\.cpp|CMP0118-WARN-Test4-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test4-build/Generated_with_full_path1\.txt|CMP0118-WARN-Test4-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test4\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test4-build/Generated_with_full_path1\.cpp|CMP0118-WARN-Test4-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test4-build/Generated_with_full_path1\.txt|CMP0118-WARN-Test4-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test4\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test4-build/Generated_with_full_path1\.cpp|CMP0118-WARN-Test4-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test4-build/Generated_with_full_path1\.txt|CMP0118-WARN-Test4-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test4\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test4-build/Generated_with_full_path1\.cpp|CMP0118-WARN-Test4-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test4-build/Generated_with_full_path1\.txt|CMP0118-WARN-Test4-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test4\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test4-build/Generated_with_full_path1\.cpp|CMP0118-WARN-Test4-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test4-build/Generated_with_full_path1\.txt|CMP0118-WARN-Test4-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-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-WARN-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-WARN-Test4b-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt
index 7a685d1..f8484d0 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt
@@ -11,12 +11,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_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`
+Generated_with_full_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 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
@@ -30,12 +30,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 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 = `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_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 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
@@ -68,12 +68,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_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`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 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
@@ -87,12 +87,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 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,12 +106,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_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_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 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
@@ -125,12 +125,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_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`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 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
@@ -144,12 +144,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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 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,56 +163,50 @@ 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 = `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\):
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-WARN-Test4b-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test4b-build/Generated_with_full_path1\.txt|CMP0118-WARN-Test4b-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test4b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-WARN-Test4b-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test4b-build/Generated_with_full_path1\.txt|CMP0118-WARN-Test4b-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test4b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-WARN-Test4b-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test4b-build/Generated_with_full_path1\.txt|CMP0118-WARN-Test4b-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test4b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-WARN-Test4b-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test4b-build/Generated_with_full_path1\.txt|CMP0118-WARN-Test4b-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test4b\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test4b\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test4b-build/Generated_with_full_path1\.cpp|CMP0118-WARN-Test4b-build/Generated_with_relative_path1\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test4b-build/Generated_with_full_path1\.txt|CMP0118-WARN-Test4b-build/Generated_with_relative_path1\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-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-WARN-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-WARN-Test5-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt
index c258ba0..0556391 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 = `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_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path1\.txt: # 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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path2\.txt: # 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 = `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_full_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_relative_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path1\.txt: # 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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path2\.txt: # 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 = `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_relative_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_relative_path3\.txt: # 3b # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 1a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 1b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2a # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 2b # GENERATED = `1`
+Generated_with_full_source_path1\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path1\.txt: # 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 = `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_path2\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path2\.txt: # 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,72 +148,66 @@ 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 = `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\):
+Generated_with_full_source_path3\.txt: # 1a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 1b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 2b # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3a # GENERATED = `0`
+Generated_with_full_source_path3\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test5\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test5\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.cpp|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.cpp)
+[ \t]*.*Tests/RunCMake/CMP0118/(Generated_with_full_source_path[1-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_relative_path[2-3]\.txt|CMP0118-WARN-Test5-build/Generated_with_full_path[2-3]\.txt)
 Call Stack \(most recent call first\):
   CMP0118-WARN-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-WARN-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-WARN-Test6-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test6-stderr.txt
index 25de751..7d588a2 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test6-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test6-stderr.txt
@@ -1,49 +1,43 @@
-^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\):
+^Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test6\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test6-build/Generated_source4\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-WARN-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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test6-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test6\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt
index 1d9ac49..8421061 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt
@@ -21,86 +21,80 @@ 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 = `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 = `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-Test7\.cmake:[0-9]+ \(add_executable\):
+Generated_source1\.txt: # 1a # GENERATED = `1`
+Generated_source1\.txt: # 1b # GENERATED = `1`
+Generated_source1\.txt: # 2a # GENERATED = `1`
+Generated_source1\.txt: # 2b # GENERATED = `1`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `0`
+Generated_source2\.txt: # 1b # GENERATED = `0`
+Generated_source2\.txt: # 2a # GENERATED = `0`
+Generated_source2\.txt: # 2b # GENERATED = `0`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `0`
+Generated_source3\.txt: # 1b # GENERATED = `0`
+Generated_source3\.txt: # 2a # GENERATED = `0`
+Generated_source3\.txt: # 2b # GENERATED = `0`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-build/Generated_source[2-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test7\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-build/Generated_source[2-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test7\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-build/Generated_source[2-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test7\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-build/Generated_source[2-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test7\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test7\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-build/Generated_source[2-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-build/Generated_source[2-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-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[2-6]
-Call Stack \(most recent call first\):
-  CMP0118-WARN-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-WARN-Test8-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test8-stderr.txt
index 5aaf6c6..e0f17e6 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test8-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test8-stderr.txt
@@ -1,49 +1,43 @@
-^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\):
+^Generated_source1\.txt: # 1a # GENERATED = `0`
+Generated_source1\.txt: # 1b # GENERATED = `0`
+Generated_source1\.txt: # 2a # GENERATED = `0`
+Generated_source1\.txt: # 2b # GENERATED = `0`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `1`
+Generated_source2\.txt: # 1b # GENERATED = `1`
+Generated_source2\.txt: # 2a # GENERATED = `1`
+Generated_source2\.txt: # 2b # GENERATED = `1`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `1`
+Generated_source3\.txt: # 1b # GENERATED = `1`
+Generated_source3\.txt: # 2a # GENERATED = `1`
+Generated_source3\.txt: # 2b # GENERATED = `1`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `1`
+Generated_source5\.txt: # 1b # GENERATED = `1`
+Generated_source5\.txt: # 2a # GENERATED = `1`
+Generated_source5\.txt: # 2b # GENERATED = `1`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `1`
+Generated_source6\.txt: # 1b # GENERATED = `1`
+Generated_source6\.txt: # 2a # GENERATED = `1`
+Generated_source6\.txt: # 2b # GENERATED = `1`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test8\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test8-build/Generated_source4\.cpp
-Call Stack \(most recent call first\):
-  CMP0118-WARN-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
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test8-build/Generated_source4\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test8\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt
index a4edec0..80f3edf 100644
--- a/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt
+++ b/Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt
@@ -21,70 +21,64 @@ 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 = `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\):
+Generated_source1\.txt: # 1a # GENERATED = `0`
+Generated_source1\.txt: # 1b # GENERATED = `0`
+Generated_source1\.txt: # 2a # GENERATED = `0`
+Generated_source1\.txt: # 2b # GENERATED = `0`
+Generated_source1\.txt: # 3a # GENERATED = `0`
+Generated_source1\.txt: # 3b # GENERATED = `0`
+Generated_source2\.txt: # 1a # GENERATED = `0`
+Generated_source2\.txt: # 1b # GENERATED = `0`
+Generated_source2\.txt: # 2a # GENERATED = `0`
+Generated_source2\.txt: # 2b # GENERATED = `0`
+Generated_source2\.txt: # 3a # GENERATED = `0`
+Generated_source2\.txt: # 3b # GENERATED = `0`
+Generated_source3\.txt: # 1a # GENERATED = `0`
+Generated_source3\.txt: # 1b # GENERATED = `0`
+Generated_source3\.txt: # 2a # GENERATED = `0`
+Generated_source3\.txt: # 2b # GENERATED = `0`
+Generated_source3\.txt: # 3a # GENERATED = `0`
+Generated_source3\.txt: # 3b # GENERATED = `0`
+Generated_source4\.txt: # 1a # GENERATED = `0`
+Generated_source4\.txt: # 1b # GENERATED = `0`
+Generated_source4\.txt: # 2a # GENERATED = `0`
+Generated_source4\.txt: # 2b # GENERATED = `0`
+Generated_source4\.txt: # 3a # GENERATED = `0`
+Generated_source4\.txt: # 3b # GENERATED = `0`
+Generated_source5\.txt: # 1a # GENERATED = `0`
+Generated_source5\.txt: # 1b # GENERATED = `0`
+Generated_source5\.txt: # 2a # GENERATED = `0`
+Generated_source5\.txt: # 2b # GENERATED = `0`
+Generated_source5\.txt: # 3a # GENERATED = `0`
+Generated_source5\.txt: # 3b # GENERATED = `0`
+Generated_source6\.txt: # 1a # GENERATED = `0`
+Generated_source6\.txt: # 1b # GENERATED = `0`
+Generated_source6\.txt: # 2a # GENERATED = `0`
+Generated_source6\.txt: # 2b # GENERATED = `0`
+Generated_source6\.txt: # 3a # GENERATED = `0`
+Generated_source6\.txt: # 3b # GENERATED = `0`
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-build/Generated_source[4-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test9\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-build/Generated_source[4-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-Test9\.cmake:[0-9]+ \(include\)
   CMakeLists\.txt:[0-9]+ \(include\)
 +
-CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_executable\):
+CMake Error at CMP0118-Common-Test9\.cmake:[0-9]+ \(add_custom_target\):
   Cannot find source file:
 
-[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-build/Generated_source[4-6]\.cpp
+[ \t]*.*Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-build/Generated_source[4-6]\.txt
 Call Stack \(most recent call first\):
   CMP0118-WARN-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-WARN-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/CMakeLists.txt b/Tests/RunCMake/CMP0118/CMakeLists.txt
index 3e06bbc..0d30651 100644
--- a/Tests/RunCMake/CMP0118/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/CMakeLists.txt
@@ -1,4 +1,4 @@
 cmake_minimum_required(VERSION 3.19)
 cmake_policy(SET CMP0115 NEW)
-project(${RunCMake_TEST} CXX)
+project(${RunCMake_TEST} NONE)
 include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CMP0118/subdir-Common-Test10/CMakeLists.txt b/Tests/RunCMake/CMP0118/subdir-Common-Test10/CMakeLists.txt
index fbd42ac..6bc99cb 100644
--- a/Tests/RunCMake/CMP0118/subdir-Common-Test10/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/subdir-Common-Test10/CMakeLists.txt
@@ -1,33 +1,33 @@
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
 )
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
 )
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "1")
diff --git a/Tests/RunCMake/CMP0118/subdir-Common-Test11/CMakeLists.txt b/Tests/RunCMake/CMP0118/subdir-Common-Test11/CMakeLists.txt
index fc72dd7..fbd7e6f 100644
--- a/Tests/RunCMake/CMP0118/subdir-Common-Test11/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/subdir-Common-Test11/CMakeLists.txt
@@ -1,33 +1,33 @@
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
 )
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
 )
 add_custom_command(
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.txt"
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "0")
diff --git a/Tests/RunCMake/CMP0118/subdir-Common-Test12/CMakeLists.txt b/Tests/RunCMake/CMP0118/subdir-Common-Test12/CMakeLists.txt
index 034f69c..916725c 100644
--- a/Tests/RunCMake/CMP0118/subdir-Common-Test12/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/subdir-Common-Test12/CMakeLists.txt
@@ -1,33 +1,33 @@
-add_custom_command(TARGET executable4 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
-  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+add_custom_command(TARGET custom4 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
+  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
 )
-add_custom_command(TARGET executable5 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
-  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+add_custom_command(TARGET custom5 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
+  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
 )
-add_custom_command(TARGET executable6 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
+add_custom_command(TARGET custom6 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "1")
diff --git a/Tests/RunCMake/CMP0118/subdir-Common-Test13/CMakeLists.txt b/Tests/RunCMake/CMP0118/subdir-Common-Test13/CMakeLists.txt
index a0a0808..f2929aa 100644
--- a/Tests/RunCMake/CMP0118/subdir-Common-Test13/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/subdir-Common-Test13/CMakeLists.txt
@@ -1,33 +1,33 @@
-add_custom_command(TARGET executable4 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
-  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+add_custom_command(TARGET custom4 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
+  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
 )
-add_custom_command(TARGET executable5 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
-  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+add_custom_command(TARGET custom5 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
+  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
 )
-add_custom_command(TARGET executable6 PRE_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
+add_custom_command(TARGET custom6 PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  BYPRODUCT "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.txt"
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "0")
diff --git a/Tests/RunCMake/CMP0118/subdir-Common-Test14/CMakeLists.txt b/Tests/RunCMake/CMP0118/subdir-Common-Test14/CMakeLists.txt
index 5d47115..7397db9 100644
--- a/Tests/RunCMake/CMP0118/subdir-Common-Test14/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/subdir-Common-Test14/CMakeLists.txt
@@ -1,33 +1,33 @@
-add_custom_target(executable4_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+add_custom_target(custom4_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
 )
-add_custom_target(executable5_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+add_custom_target(custom5_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
 )
-add_custom_target(executable6_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
+add_custom_target(custom6_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "1")
diff --git a/Tests/RunCMake/CMP0118/subdir-Common-Test15/CMakeLists.txt b/Tests/RunCMake/CMP0118/subdir-Common-Test15/CMakeLists.txt
index 0ad62f7..314e427 100644
--- a/Tests/RunCMake/CMP0118/subdir-Common-Test15/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/subdir-Common-Test15/CMakeLists.txt
@@ -1,33 +1,33 @@
-add_custom_target(executable4_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+add_custom_target(custom4_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
 )
-add_custom_target(executable5_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+add_custom_target(custom5_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
 )
-add_custom_target(executable6_source_generator ALL
-  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.cpp.in"
-                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
+add_custom_target(custom6_source_generator ALL
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Source.txt.in"
+                                   "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.txt"
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "0")
diff --git a/Tests/RunCMake/CMP0118/subdir-Common-Test6/CMakeLists.txt b/Tests/RunCMake/CMP0118/subdir-Common-Test6/CMakeLists.txt
index d35a030..fa307d1 100644
--- a/Tests/RunCMake/CMP0118/subdir-Common-Test6/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/subdir-Common-Test6/CMakeLists.txt
@@ -1,16 +1,16 @@
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "1")
diff --git a/Tests/RunCMake/CMP0118/subdir-Common-Test7/CMakeLists.txt b/Tests/RunCMake/CMP0118/subdir-Common-Test7/CMakeLists.txt
index 2f28178..6362f78 100644
--- a/Tests/RunCMake/CMP0118/subdir-Common-Test7/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/subdir-Common-Test7/CMakeLists.txt
@@ -1,16 +1,16 @@
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.txt"
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "0")
diff --git a/Tests/RunCMake/CMP0118/subdir-Common-Test8/CMakeLists.txt b/Tests/RunCMake/CMP0118/subdir-Common-Test8/CMakeLists.txt
index bcc1ebe..55debd1 100644
--- a/Tests/RunCMake/CMP0118/subdir-Common-Test8/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/subdir-Common-Test8/CMakeLists.txt
@@ -1,30 +1,30 @@
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "1")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "1")
diff --git a/Tests/RunCMake/CMP0118/subdir-Common-Test9/CMakeLists.txt b/Tests/RunCMake/CMP0118/subdir-Common-Test9/CMakeLists.txt
index a50d02a..cdb8884 100644
--- a/Tests/RunCMake/CMP0118/subdir-Common-Test9/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0118/subdir-Common-Test9/CMakeLists.txt
@@ -1,30 +1,30 @@
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source4.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source5.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 file(GENERATE
-  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.cpp"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Generated_source6.txt"
   CONTENT "int func();\nint main(){ return func(); }"
 )
 
 
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source1.txt"
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source2.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source3.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source4.txt"
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.cpp"
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source5.txt"
   DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
   PROPERTY GENERATED "0")
-set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.cpp"
-  TARGET_DIRECTORY executable1
+set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/../Generated_source6.txt"
+  TARGET_DIRECTORY custom1
   PROPERTY GENERATED "0")