소스 검색

Merge topic 'test-CMP0118'

43506037d2 Tests: Avoid unnecessary use of toolchain in RunCMake.CMP0118

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5571
Brad King 5 년 전
부모
커밋
74e1b36579
76개의 변경된 파일3007개의 추가작업 그리고 3259개의 파일을 삭제
  1. 4 4
      Tests/RunCMake/CMP0118/CMP0118-Common-Test1.cmake
  2. 42 42
      Tests/RunCMake/CMP0118/CMP0118-Common-Test10.cmake
  3. 42 42
      Tests/RunCMake/CMP0118/CMP0118-Common-Test11.cmake
  4. 46 46
      Tests/RunCMake/CMP0118/CMP0118-Common-Test12.cmake
  5. 46 46
      Tests/RunCMake/CMP0118/CMP0118-Common-Test13.cmake
  6. 46 46
      Tests/RunCMake/CMP0118/CMP0118-Common-Test14.cmake
  7. 46 46
      Tests/RunCMake/CMP0118/CMP0118-Common-Test15.cmake
  8. 5 5
      Tests/RunCMake/CMP0118/CMP0118-Common-Test2.cmake
  9. 37 37
      Tests/RunCMake/CMP0118/CMP0118-Common-Test3.cmake
  10. 37 37
      Tests/RunCMake/CMP0118/CMP0118-Common-Test3b.cmake
  11. 37 37
      Tests/RunCMake/CMP0118/CMP0118-Common-Test4.cmake
  12. 37 37
      Tests/RunCMake/CMP0118/CMP0118-Common-Test4b.cmake
  13. 45 45
      Tests/RunCMake/CMP0118/CMP0118-Common-Test5.cmake
  14. 27 27
      Tests/RunCMake/CMP0118/CMP0118-Common-Test6.cmake
  15. 27 27
      Tests/RunCMake/CMP0118/CMP0118-Common-Test7.cmake
  16. 27 27
      Tests/RunCMake/CMP0118/CMP0118-Common-Test8.cmake
  17. 27 27
      Tests/RunCMake/CMP0118/CMP0118-Common-Test9.cmake
  18. 2 8
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test1-stderr.txt
  19. 44 50
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test10-stderr.txt
  20. 48 54
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test11-stderr.txt
  21. 45 45
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test12-stderr.txt
  22. 45 45
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test13-stderr.txt
  23. 44 50
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test14-stderr.txt
  24. 48 54
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test15-stderr.txt
  25. 62 68
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test3-stderr.txt
  26. 62 68
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test3b-stderr.txt
  27. 64 70
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test4-stderr.txt
  28. 64 70
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test4b-stderr.txt
  29. 68 74
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test5-stderr.txt
  30. 38 44
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test6-stderr.txt
  31. 42 48
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test7-stderr.txt
  32. 38 44
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test8-stderr.txt
  33. 42 48
      Tests/RunCMake/CMP0118/CMP0118-NEW-Test9-stderr.txt
  34. 2 8
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test1-stderr.txt
  35. 44 50
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test10-stderr.txt
  36. 48 54
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test11-stderr.txt
  37. 45 45
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test12-stderr.txt
  38. 45 45
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test13-stderr.txt
  39. 44 50
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test14-stderr.txt
  40. 48 54
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test15-stderr.txt
  41. 62 68
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test3-stderr.txt
  42. 62 68
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test3b-stderr.txt
  43. 64 70
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test4-stderr.txt
  44. 64 70
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test4b-stderr.txt
  45. 68 74
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test5-stderr.txt
  46. 38 44
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test6-stderr.txt
  47. 46 52
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test7-stderr.txt
  48. 38 44
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test8-stderr.txt
  49. 42 48
      Tests/RunCMake/CMP0118/CMP0118-OLD-Test9-stderr.txt
  50. 2 8
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test1-stderr.txt
  51. 44 50
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test10-stderr.txt
  52. 48 54
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test11-stderr.txt
  53. 45 45
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test12-stderr.txt
  54. 45 45
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test13-stderr.txt
  55. 44 50
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test14-stderr.txt
  56. 48 54
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test15-stderr.txt
  57. 62 68
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test3-stderr.txt
  58. 62 68
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test3b-stderr.txt
  59. 64 70
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test4-stderr.txt
  60. 64 70
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test4b-stderr.txt
  61. 68 74
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test5-stderr.txt
  62. 38 44
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test6-stderr.txt
  63. 46 52
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test7-stderr.txt
  64. 38 44
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test8-stderr.txt
  65. 42 48
      Tests/RunCMake/CMP0118/CMP0118-WARN-Test9-stderr.txt
  66. 1 1
      Tests/RunCMake/CMP0118/CMakeLists.txt
  67. 17 17
      Tests/RunCMake/CMP0118/subdir-Common-Test10/CMakeLists.txt
  68. 17 17
      Tests/RunCMake/CMP0118/subdir-Common-Test11/CMakeLists.txt
  69. 20 20
      Tests/RunCMake/CMP0118/subdir-Common-Test12/CMakeLists.txt
  70. 20 20
      Tests/RunCMake/CMP0118/subdir-Common-Test13/CMakeLists.txt
  71. 20 20
      Tests/RunCMake/CMP0118/subdir-Common-Test14/CMakeLists.txt
  72. 20 20
      Tests/RunCMake/CMP0118/subdir-Common-Test15/CMakeLists.txt
  73. 8 8
      Tests/RunCMake/CMP0118/subdir-Common-Test6/CMakeLists.txt
  74. 8 8
      Tests/RunCMake/CMP0118/subdir-Common-Test7/CMakeLists.txt
  75. 11 11
      Tests/RunCMake/CMP0118/subdir-Common-Test8/CMakeLists.txt
  76. 11 11
      Tests/RunCMake/CMP0118/subdir-Common-Test9/CMakeLists.txt

+ 4 - 4
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}`")

+ 42 - 42
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")

+ 42 - 42
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")

+ 46 - 46
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")

+ 46 - 46
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")

+ 46 - 46
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")

+ 46 - 46
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")

+ 5 - 5
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}`")

+ 37 - 37
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")

+ 37 - 37
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"
 )

+ 37 - 37
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")

+ 37 - 37
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"
 )

+ 45 - 45
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")

+ 27 - 27
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")

+ 27 - 27
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")

+ 27 - 27
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")

+ 27 - 27
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")

+ 2 - 8
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\)

+ 44 - 50
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\)

+ 48 - 54
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\.$

+ 45 - 45
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`$

+ 45 - 45
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`$

+ 44 - 50
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\)

+ 48 - 54
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\.$

+ 62 - 68
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\.$

+ 62 - 68
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\.$

+ 64 - 70
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\.$

+ 64 - 70
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\.$

+ 68 - 74
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\.$

+ 38 - 44
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\)

+ 42 - 48
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\.$

+ 38 - 44
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\)

+ 42 - 48
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\.$

+ 2 - 8
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\)

+ 44 - 50
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\)

+ 48 - 54
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\.$

+ 45 - 45
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`$

+ 45 - 45
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`$

+ 44 - 50
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\)

+ 48 - 54
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\.$

+ 62 - 68
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\.$

+ 62 - 68
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\.$

+ 64 - 70
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\.$

+ 64 - 70
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\.$

+ 68 - 74
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\.$

+ 38 - 44
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\)

+ 46 - 52
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\.$

+ 38 - 44
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\)

+ 42 - 48
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\.$

+ 2 - 8
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\)

+ 44 - 50
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\)

+ 48 - 54
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\.$

+ 45 - 45
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`$

+ 45 - 45
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`$

+ 44 - 50
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\)

+ 48 - 54
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\.$

+ 62 - 68
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\.$

+ 62 - 68
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\.$

+ 64 - 70
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\.$

+ 64 - 70
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\.$

+ 68 - 74
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\.$

+ 38 - 44
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\)

+ 46 - 52
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\.$

+ 38 - 44
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\)

+ 42 - 48
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\.$

+ 1 - 1
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)

+ 17 - 17
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")

+ 17 - 17
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")

+ 20 - 20
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")

+ 20 - 20
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")

+ 20 - 20
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")

+ 20 - 20
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")

+ 8 - 8
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")

+ 8 - 8
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")

+ 11 - 11
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")

+ 11 - 11
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")