221 files changed, 176 insertions, 176 deletions

diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_command-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_command-stderr.txt
deleted file mode 100644
index c8f773a0a5..0000000000
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_command-stderr.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-CMake Error at COMPILE_LANGUAGE-add_custom_command.cmake:2 \(add_custom_command\):
-  Error evaluating generator expression:
-
-    \$<COMPILE_LANGUAGE>
-
-  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
-  compile definitions, compile options, and to evaluate components of the
-  file\(GENERATE\) command.
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_target-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_target-stderr.txt
deleted file mode 100644
index 7025838b17..0000000000
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_target-stderr.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-CMake Error at COMPILE_LANGUAGE-add_custom_target.cmake:1 \(add_custom_target\):
-  Error evaluating generator expression:
-
-    \$<COMPILE_LANGUAGE>
-
-  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
-  compile definitions, compile options, and to evaluate components of the
-  file\(GENERATE\) command.
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/RunCMakeTest.cmake b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/RunCMakeTest.cmake
index 15a5e79eb4..3e6e08083b 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/RunCMakeTest.cmake
@@ -1,11 +1,11 @@
 include(RunCMake)
 
-run_cmake(COMPILE_LANGUAGE-add_custom_target)
-run_cmake(COMPILE_LANGUAGE-add_custom_command)
-run_cmake(COMPILE_LANGUAGE-install)
-run_cmake(COMPILE_LANGUAGE-target_sources)
-run_cmake(COMPILE_LANGUAGE-add_executable)
-run_cmake(COMPILE_LANGUAGE-add_library)
-run_cmake(COMPILE_LANGUAGE-add_test)
-run_cmake(COMPILE_LANGUAGE-unknown-lang)
-run_cmake(COMPILE_LANGUAGE-TARGET_PROPERTY)
+run_cmake(add_custom_target)
+run_cmake(add_custom_command)
+run_cmake(install)
+run_cmake(target_sources)
+run_cmake(add_executable)
+run_cmake(add_library)
+run_cmake(add_test)
+run_cmake(unknown-lang)
+run_cmake(TARGET_PROPERTY)
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-TARGET_PROPERTY.cmake b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/TARGET_PROPERTY.cmake
index 293dddaccd..293dddaccd 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-TARGET_PROPERTY.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/TARGET_PROPERTY.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_command-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_command-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_command-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_command-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_library-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_command-stderr.txt
index 2ac9b76ac5..72f0fc8572 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_library-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_command-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANGUAGE-add_library.cmake:1 \(add_library\):
+CMake Error at add_custom_command.cmake:2 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANGUAGE>
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_command.cmake b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_command.cmake
index c3f051ab41..c3f051ab41 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_command.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_command.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_target-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_target-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_target-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_target-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-target_sources-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_target-stderr.txt
index 8e7f88125c..a8ef8d7443 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-target_sources-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_target-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANGUAGE-target_sources.cmake:2 \(target_sources\):
+CMake Error at add_custom_target.cmake:1 \(add_custom_target\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANGUAGE>
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_target.cmake b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_target.cmake
index b826772e21..b826772e21 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_custom_target.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_custom_target.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_executable-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_executable-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_executable-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_executable-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_test-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_executable-stderr.txt
index fd8a731f13..2e7cc3e62f 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_test-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_executable-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANGUAGE-add_test.cmake:5 \(add_test\):
+CMake Error at add_executable.cmake:1 \(add_executable\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANGUAGE>
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_executable.cmake b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_executable.cmake
index ff965a9e73..ff965a9e73 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_executable.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_executable.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_library-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_library-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_library-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_library-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_executable-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_library-stderr.txt
index 8d05e59a0e..ffbac65991 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_executable-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_library-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANGUAGE-add_executable.cmake:1 \(add_executable\):
+CMake Error at add_library.cmake:1 \(add_library\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANGUAGE>
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_library.cmake b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_library.cmake
index dd1b5a2d75..dd1b5a2d75 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_library.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_library.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_test-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_test-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_test-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_test-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_test-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_test-stderr.txt
new file mode 100644
index 0000000000..2f13655f12
--- /dev/null
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_test-stderr.txt
@@ -0,0 +1,10 @@
+CMake Error at add_test.cmake:5 \(add_test\):
+  Error evaluating generator expression:
+
+    \$<COMPILE_LANGUAGE>
+
+  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+  compile definitions, compile options, and to evaluate components of the
+  file\(GENERATE\) command.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_test.cmake b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_test.cmake
index deedf659e3..deedf659e3 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-add_test.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/add_test.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-install-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/install-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-install-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/install-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-install-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/install-stderr.txt
index bef7f63b9a..bef7f63b9a 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-install-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/install-stderr.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-install.cmake b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/install.cmake
index 92c20e32d1..92c20e32d1 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-install.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/install.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-target_sources-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/target_sources-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-target_sources-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/target_sources-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/target_sources-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/target_sources-stderr.txt
new file mode 100644
index 0000000000..f552e956da
--- /dev/null
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/target_sources-stderr.txt
@@ -0,0 +1,10 @@
+CMake Error at target_sources.cmake:2 \(target_sources\):
+  Error evaluating generator expression:
+
+    \$<COMPILE_LANGUAGE>
+
+  \$<COMPILE_LANGUAGE:...> may only be used to specify include directories,
+  compile definitions, compile options, and to evaluate components of the
+  file\(GENERATE\) command.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-target_sources.cmake b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/target_sources.cmake
index a4a5abb5ec..a4a5abb5ec 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-target_sources.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/target_sources.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-unknown-lang.cmake b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/unknown-lang.cmake
index 00dd29070e..00dd29070e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/COMPILE_LANGUAGE-unknown-lang.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANGUAGE/unknown-lang.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/RunCMakeTest.cmake b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/RunCMakeTest.cmake
index 68bd05d2e1..3e6e08083b 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/RunCMakeTest.cmake
@@ -1,11 +1,11 @@
 include(RunCMake)
 
-run_cmake(COMPILE_LANG_AND_ID-add_custom_target)
-run_cmake(COMPILE_LANG_AND_ID-add_custom_command)
-run_cmake(COMPILE_LANG_AND_ID-install)
-run_cmake(COMPILE_LANG_AND_ID-target_sources)
-run_cmake(COMPILE_LANG_AND_ID-add_executable)
-run_cmake(COMPILE_LANG_AND_ID-add_library)
-run_cmake(COMPILE_LANG_AND_ID-add_test)
-run_cmake(COMPILE_LANG_AND_ID-unknown-lang)
-run_cmake(COMPILE_LANG_AND_ID-TARGET_PROPERTY)
+run_cmake(add_custom_target)
+run_cmake(add_custom_command)
+run_cmake(install)
+run_cmake(target_sources)
+run_cmake(add_executable)
+run_cmake(add_library)
+run_cmake(add_test)
+run_cmake(unknown-lang)
+run_cmake(TARGET_PROPERTY)
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-TARGET_PROPERTY.cmake b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/TARGET_PROPERTY.cmake
index 6a718d64a8..6a718d64a8 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-TARGET_PROPERTY.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/TARGET_PROPERTY.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_command-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_command-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_command-stderr.txt
index 3ecbdc3608..0c3c3f9f6b 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_command-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANG_AND_ID-target_sources.cmake:2 \(target_sources\):
+CMake Error at add_custom_command.cmake:2 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANG_AND_ID>
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command.cmake b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_command.cmake
index 9bd5e8e7e4..9bd5e8e7e4 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_command.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_target-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_target-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_target-stderr.txt
index 589e64b4ec..ae85ca6c0a 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_target-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANG_AND_ID-add_custom_target.cmake:2 \(add_custom_target\):
+CMake Error at add_custom_target.cmake:2 \(add_custom_target\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANG_AND_ID:LANG,ID>
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target.cmake b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_target.cmake
index 398db19780..398db19780 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_target.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_custom_target.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_executable-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_executable-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_executable-stderr.txt
index 4cbf000ea0..ed03f204b3 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_executable-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANG_AND_ID-add_library.cmake:2 \(add_library\):
+CMake Error at add_executable.cmake:1 \(add_executable\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANG_AND_ID:C,MSVC>
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable.cmake b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_executable.cmake
index 2245f5046b..2245f5046b 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_executable.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_library-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_library-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_library-stderr.txt
index 3b3f38d370..0014c16c40 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_executable-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_library-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANG_AND_ID-add_executable.cmake:1 \(add_executable\):
+CMake Error at add_library.cmake:2 \(add_library\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANG_AND_ID:C,MSVC>
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library.cmake b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_library.cmake
index 044962a53e..044962a53e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_library.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_library.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_test-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_test-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_test-stderr.txt
index 26a5940f3b..73b1a7d15f 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_test-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANG_AND_ID-add_test.cmake:5 \(add_test\):
+CMake Error at add_test.cmake:5 \(add_test\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANG_AND_ID:CXX,GNU>
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test.cmake b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_test.cmake
index b5b6c2b82c..b5b6c2b82c 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_test.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/add_test.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/install-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/install-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/install-stderr.txt
index 0c4ecd091b..0c4ecd091b 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/install-stderr.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install.cmake b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/install.cmake
index c13eda6ecb..c13eda6ecb 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-install.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/install.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources-result.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/target_sources-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources-result.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/target_sources-result.txt
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command-stderr.txt b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/target_sources-stderr.txt
index 2ee96ed14c..ea6fbbf44b 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-add_custom_command-stderr.txt
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/target_sources-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at COMPILE_LANG_AND_ID-add_custom_command.cmake:2 \(add_custom_command\):
+CMake Error at target_sources.cmake:2 \(target_sources\):
   Error evaluating generator expression:
 
     \$<COMPILE_LANG_AND_ID>
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources.cmake b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/target_sources.cmake
index a2c9b03f5c..a2c9b03f5c 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-target_sources.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/target_sources.cmake
diff --git a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-unknown-lang.cmake b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/unknown-lang.cmake
index b9e840b411..b9e840b411 100644
--- a/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/COMPILE_LANG_AND_ID-unknown-lang.cmake
+++ b/Tests/RunCMake/GenEx-COMPILE_LANG_AND_ID/unknown-lang.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/RunCMakeTest.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/RunCMakeTest.cmake
index 80633e2580..1ce98f0fd2 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/RunCMakeTest.cmake
@@ -1,18 +1,18 @@
 include(RunCMake)
 
-run_cmake(DEVICE_LINK-add_custom_target)
-run_cmake(DEVICE_LINK-add_custom_command)
-run_cmake(DEVICE_LINK-install)
-run_cmake(DEVICE_LINK-add_executable)
-run_cmake(DEVICE_LINK-add_library)
-run_cmake(DEVICE_LINK-add_test)
-run_cmake(DEVICE_LINK-target_sources)
-run_cmake(DEVICE_LINK-target_compile_definitions)
-run_cmake(DEVICE_LINK-target_compile_options)
-run_cmake(DEVICE_LINK-target_include_directories)
-run_cmake(DEVICE_LINK-target_link_libraries)
-run_cmake(DEVICE_LINK-target_link_directories)
-run_cmake(DEVICE_LINK-try_compile)
+run_cmake(add_custom_target)
+run_cmake(add_custom_command)
+run_cmake(install)
+run_cmake(add_executable)
+run_cmake(add_library)
+run_cmake(add_test)
+run_cmake(target_sources)
+run_cmake(target_compile_definitions)
+run_cmake(target_compile_options)
+run_cmake(target_include_directories)
+run_cmake(target_link_libraries)
+run_cmake(target_link_directories)
+run_cmake(try_compile)
 if(RunCMake_GENERATOR MATCHES "(Ninja|Makefile)")
-  run_cmake(DEVICE_LINK-link_depends)
+  run_cmake(link_depends)
 endif()
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_command-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_command-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_command-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_command-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_target-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_command-stderr.txt
index cdd3043a28..273c3b2be1 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_target-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_command-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-add_custom_target.cmake:[0-9]+ \(add_custom_target\):
+CMake Error at add_custom_command.cmake:[0-9]+ \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_command.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_command.cmake
index 01b3784930..01b3784930 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_command.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_command.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_target-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_target-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_target-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_target-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_command-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_target-stderr.txt
index eb15834c5f..0c015fa6f6 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_command-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_target-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-add_custom_command.cmake:[0-9]+ \(add_custom_command\):
+CMake Error at add_custom_target.cmake:[0-9]+ \(add_custom_target\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_target.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_target.cmake
index 35728e9c00..35728e9c00 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_custom_target.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_custom_target.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_executable-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/add_executable-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_executable-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_executable-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_library-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/add_executable-stderr.txt
index 4477e00ae5..3d5bfb3720 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_library-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_executable-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-add_library.cmake:[0-9]+ \(add_library\):
+CMake Error at add_executable.cmake:[0-9]+ \(add_executable\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK:empty.c>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_executable.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/add_executable.cmake
index 899f8f68aa..899f8f68aa 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_executable.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_executable.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_library-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/add_library-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_library-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_library-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_executable-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/add_library-stderr.txt
index 56b595c745..5b8448b696 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_executable-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_library-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-add_executable.cmake:[0-9]+ \(add_executable\):
+CMake Error at add_library.cmake:[0-9]+ \(add_library\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK:empty.c>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_library.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/add_library.cmake
index fc8547b606..fc8547b606 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_library.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_library.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_test-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/add_test-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_test-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_test-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_test-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/add_test-stderr.txt
index 99561fe2cc..56f8ce7e69 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_test-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_test-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-add_test.cmake:[0-9]+ \(add_test\):
+CMake Error at add_test.cmake:[0-9]+ \(add_test\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_test.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/add_test.cmake
index 87d6ba16dc..87d6ba16dc 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-add_test.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/add_test.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-install-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/install-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-install-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/install-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-install-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/install-stderr.txt
index afb3090ad7..afb3090ad7 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-install-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/install-stderr.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-install.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/install.cmake
index 4b6dbef283..4b6dbef283 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-install.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/install.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-link_depends-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/link_depends-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-link_depends-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/link_depends-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-link_depends-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/link_depends-stderr.txt
index 4fa0522b04..4fa0522b04 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-link_depends-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/link_depends-stderr.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-link_depends.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/link_depends.cmake
index 8129514a4a..8129514a4a 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-link_depends.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/link_depends.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_definitions-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_definitions-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_definitions-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_definitions-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_definitions-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_definitions-stderr.txt
index c0185e3a7a..e6bd546a4d 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_definitions-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_definitions-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-target_compile_definitions.cmake:[0-9]+ \(target_compile_definitions\):
+CMake Error at target_compile_definitions.cmake:[0-9]+ \(target_compile_definitions\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK:DEF>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_definitions.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_definitions.cmake
index aaa8efc1ff..aaa8efc1ff 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_definitions.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_definitions.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_options-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_options-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_options-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_options-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_options-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_options-stderr.txt
index 34ca4f2369..31e0eca5c3 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_options-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_options-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-target_compile_options.cmake:[0-9]+ \(target_compile_options\):
+CMake Error at target_compile_options.cmake:[0-9]+ \(target_compile_options\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK:-OPT>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_options.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_options.cmake
index a9cb7fd4dd..a9cb7fd4dd 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_compile_options.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_compile_options.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_include_directories-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_include_directories-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_include_directories-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_include_directories-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_directories-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_include_directories-stderr.txt
index d924916a5b..b104e1bee5 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_directories-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_include_directories-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-target_link_directories.cmake:[0-9]+ \(target_link_directories\):
+CMake Error at target_include_directories.cmake:[0-9]+ \(target_include_directories\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK:/DIR>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_include_directories.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/target_include_directories.cmake
index 03cc413e8a..03cc413e8a 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_include_directories.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_include_directories.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_directories-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_directories-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_directories-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_directories-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_include_directories-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_directories-stderr.txt
index 4d1642d781..a2f9c52d63 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_include_directories-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_directories-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-target_include_directories.cmake:[0-9]+ \(target_include_directories\):
+CMake Error at target_link_directories.cmake:[0-9]+ \(target_link_directories\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK:/DIR>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_directories.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_directories.cmake
index e50d27d891..e50d27d891 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_directories.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_directories.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_libraries-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_libraries-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_libraries-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_libraries-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_libraries-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_libraries-stderr.txt
index 1436fa8fed..ce2aeee24e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_libraries-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_libraries-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-target_link_libraries.cmake:[0-9]+ \(target_link_libraries\):
+CMake Error at target_link_libraries.cmake:[0-9]+ \(target_link_libraries\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK:lib>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_libraries.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_libraries.cmake
index 971f56206e..971f56206e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_link_libraries.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_link_libraries.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_sources-result.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_sources-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_sources-result.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_sources-result.txt
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_sources-stderr.txt b/Tests/RunCMake/GenEx-DEVICE_LINK/target_sources-stderr.txt
index c9b602d842..341b0f8850 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_sources-stderr.txt
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_sources-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at DEVICE_LINK-target_sources.cmake:[0-9]+ \(target_sources\):
+CMake Error at target_sources.cmake:[0-9]+ \(target_sources\):
   Error evaluating generator expression:
 
     \$<DEVICE_LINK:empty.c>
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_sources.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/target_sources.cmake
index 94bac9e2cd..94bac9e2cd 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-target_sources.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/target_sources.cmake
diff --git a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-try_compile.cmake b/Tests/RunCMake/GenEx-DEVICE_LINK/try_compile.cmake
index 281f8aa3ab..281f8aa3ab 100644
--- a/Tests/RunCMake/GenEx-DEVICE_LINK/DEVICE_LINK-try_compile.cmake
+++ b/Tests/RunCMake/GenEx-DEVICE_LINK/try_compile.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/RunCMakeTest.cmake b/Tests/RunCMake/GenEx-HOST_LINK/RunCMakeTest.cmake
index 9e3eeec416..1ce98f0fd2 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/RunCMakeTest.cmake
@@ -1,18 +1,18 @@
 include(RunCMake)
 
-run_cmake(HOST_LINK-add_custom_target)
-run_cmake(HOST_LINK-add_custom_command)
-run_cmake(HOST_LINK-install)
-run_cmake(HOST_LINK-add_executable)
-run_cmake(HOST_LINK-add_library)
-run_cmake(HOST_LINK-add_test)
-run_cmake(HOST_LINK-target_sources)
-run_cmake(HOST_LINK-target_compile_definitions)
-run_cmake(HOST_LINK-target_compile_options)
-run_cmake(HOST_LINK-target_include_directories)
-run_cmake(HOST_LINK-target_link_libraries)
-run_cmake(HOST_LINK-target_link_directories)
-run_cmake(HOST_LINK-try_compile)
+run_cmake(add_custom_target)
+run_cmake(add_custom_command)
+run_cmake(install)
+run_cmake(add_executable)
+run_cmake(add_library)
+run_cmake(add_test)
+run_cmake(target_sources)
+run_cmake(target_compile_definitions)
+run_cmake(target_compile_options)
+run_cmake(target_include_directories)
+run_cmake(target_link_libraries)
+run_cmake(target_link_directories)
+run_cmake(try_compile)
 if(RunCMake_GENERATOR MATCHES "(Ninja|Makefile)")
-  run_cmake(HOST_LINK-link_depends)
+  run_cmake(link_depends)
 endif()
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_command-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_command-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_command-stderr.txt
index c44202a70c..0eb5e3388b 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_command-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-add_custom_target.cmake:[0-9]+ \(add_custom_target\):
+CMake Error at add_custom_command.cmake:[0-9]+ \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<HOST_LINK>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command.cmake b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_command.cmake
index 4d6e30531d..4d6e30531d 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_command.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_target-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_target-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_target-stderr.txt
index 5ad41b96d8..ffb0c3dcdc 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_command-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_target-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-add_custom_command.cmake:[0-9]+ \(add_custom_command\):
+CMake Error at add_custom_target.cmake:[0-9]+ \(add_custom_target\):
   Error evaluating generator expression:
 
     \$<HOST_LINK>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target.cmake b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_target.cmake
index eec072a960..eec072a960 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_custom_target.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_custom_target.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/add_executable-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_executable-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/add_executable-stderr.txt
index 4bd27bec97..59732d8d0b 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_executable-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-add_library.cmake:[0-9]+ \(add_library\):
+CMake Error at add_executable.cmake:[0-9]+ \(add_executable\):
   Error evaluating generator expression:
 
     \$<HOST_LINK:empty.c>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable.cmake b/Tests/RunCMake/GenEx-HOST_LINK/add_executable.cmake
index c9f74a5c04..c9f74a5c04 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_executable.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/add_library-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_library-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/add_library-stderr.txt
index b395515778..4e9fea10b6 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_executable-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_library-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-add_executable.cmake:[0-9]+ \(add_executable\):
+CMake Error at add_library.cmake:[0-9]+ \(add_library\):
   Error evaluating generator expression:
 
     \$<HOST_LINK:empty.c>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library.cmake b/Tests/RunCMake/GenEx-HOST_LINK/add_library.cmake
index 44135af00b..44135af00b 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_library.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_library.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/add_test-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_test-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/add_test-stderr.txt
index 012ad210a6..11912ddee5 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_test-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-add_test.cmake:[0-9]+ \(add_test\):
+CMake Error at add_test.cmake:[0-9]+ \(add_test\):
   Error evaluating generator expression:
 
     \$<HOST_LINK>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test.cmake b/Tests/RunCMake/GenEx-HOST_LINK/add_test.cmake
index 4b472afe4f..4b472afe4f 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-add_test.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/add_test.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/install-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/install-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/install-stderr.txt
index c265ec4188..c265ec4188 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/install-stderr.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install.cmake b/Tests/RunCMake/GenEx-HOST_LINK/install.cmake
index b4dff680eb..b4dff680eb 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-install.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/install.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/link_depends-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/link_depends-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/link_depends-stderr.txt
index 24b8b82f4b..24b8b82f4b 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/link_depends-stderr.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends.cmake b/Tests/RunCMake/GenEx-HOST_LINK/link_depends.cmake
index 0402f43e8e..0402f43e8e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-link_depends.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/link_depends.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_definitions-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_definitions-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_definitions-stderr.txt
index 6ab3c14d88..09982e1081 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_definitions-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-target_compile_definitions.cmake:[0-9]+ \(target_compile_definitions\):
+CMake Error at target_compile_definitions.cmake:[0-9]+ \(target_compile_definitions\):
   Error evaluating generator expression:
 
     \$<HOST_LINK:DEF>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions.cmake b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_definitions.cmake
index f6c130d40e..f6c130d40e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_definitions.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_definitions.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_options-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_options-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_options-stderr.txt
index 0f5bbc38c6..42ff6635f2 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_options-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-target_compile_options.cmake:[0-9]+ \(target_compile_options\):
+CMake Error at target_compile_options.cmake:[0-9]+ \(target_compile_options\):
   Error evaluating generator expression:
 
     \$<HOST_LINK:-OPT>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options.cmake b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_options.cmake
index 53afea19ef..53afea19ef 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_compile_options.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_compile_options.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_include_directories-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_include_directories-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_include_directories-stderr.txt
index 5225a52531..1c83da3077 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_include_directories-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-target_link_directories.cmake:[0-9]+ \(target_link_directories\):
+CMake Error at target_include_directories.cmake:[0-9]+ \(target_include_directories\):
   Error evaluating generator expression:
 
     \$<HOST_LINK:/DIR>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories.cmake b/Tests/RunCMake/GenEx-HOST_LINK/target_include_directories.cmake
index aff100923a..aff100923a 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_include_directories.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_link_directories-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_link_directories-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_link_directories-stderr.txt
index 9a2634a22a..0b54018092 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_include_directories-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_link_directories-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-target_include_directories.cmake:[0-9]+ \(target_include_directories\):
+CMake Error at target_link_directories.cmake:[0-9]+ \(target_link_directories\):
   Error evaluating generator expression:
 
     \$<HOST_LINK:/DIR>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories.cmake b/Tests/RunCMake/GenEx-HOST_LINK/target_link_directories.cmake
index 97488eef84..97488eef84 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_directories.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_link_directories.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_link_libraries-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_link_libraries-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_link_libraries-stderr.txt
index 6c4441f3c4..bf46e3ad4f 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_link_libraries-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-target_link_libraries.cmake:[0-9]+ \(target_link_libraries\):
+CMake Error at target_link_libraries.cmake:[0-9]+ \(target_link_libraries\):
   Error evaluating generator expression:
 
     \$<HOST_LINK:lib>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries.cmake b/Tests/RunCMake/GenEx-HOST_LINK/target_link_libraries.cmake
index d74c92d4b0..d74c92d4b0 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_link_libraries.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_link_libraries.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources-result.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_sources-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources-result.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_sources-result.txt
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources-stderr.txt b/Tests/RunCMake/GenEx-HOST_LINK/target_sources-stderr.txt
index 0e25568125..547c2e544f 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources-stderr.txt
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_sources-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at HOST_LINK-target_sources.cmake:[0-9]+ \(target_sources\):
+CMake Error at target_sources.cmake:[0-9]+ \(target_sources\):
   Error evaluating generator expression:
 
     \$<HOST_LINK:empty.c>
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources.cmake b/Tests/RunCMake/GenEx-HOST_LINK/target_sources.cmake
index ea7bf551d1..ea7bf551d1 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-target_sources.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/target_sources.cmake
diff --git a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-try_compile.cmake b/Tests/RunCMake/GenEx-HOST_LINK/try_compile.cmake
index f221ff1b6a..f221ff1b6a 100644
--- a/Tests/RunCMake/GenEx-HOST_LINK/HOST_LINK-try_compile.cmake
+++ b/Tests/RunCMake/GenEx-HOST_LINK/try_compile.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_command-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_command-stderr.txt
deleted file mode 100644
index 0b0d458fd8..0000000000
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_command-stderr.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-CMake Error at LINK_LANGUAGE-add_custom_command.cmake:2 \(add_custom_command\):
-  Error evaluating generator expression:
-
-    \$<LINK_LANGUAGE>
-
-  \$<LINK_LANGUAGE:...> may only be used with binary targets to specify link
-  libraries, link directories, link options and link depends.
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_target-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_target-stderr.txt
deleted file mode 100644
index 92da634542..0000000000
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_target-stderr.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-CMake Error at LINK_LANGUAGE-add_custom_target.cmake:1 \(add_custom_target\):
-  Error evaluating generator expression:
-
-    \$<LINK_LANGUAGE>
-
-  \$<LINK_LANGUAGE:...> may only be used with binary targets to specify link
-  libraries, link directories, link options and link depends.
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-target_sources-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-target_sources-stderr.txt
deleted file mode 100644
index d8121cce69..0000000000
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-target_sources-stderr.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-CMake Error at LINK_LANGUAGE-target_sources.cmake:2 \(target_sources\):
-  Error evaluating generator expression:
-
-    \$<LINK_LANGUAGE>
-
-  \$<LINK_LANGUAGE:...> may only be used with binary targets to specify link
-  libraries, link directories, link options and link depends.
-Call Stack \(most recent call first\):
-  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/RunCMakeTest.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/RunCMakeTest.cmake
index 4cf0c047dc..53320ac5a9 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/RunCMakeTest.cmake
@@ -1,15 +1,15 @@
 include(RunCMake)
 
-run_cmake(LINK_LANGUAGE-add_custom_target)
-run_cmake(LINK_LANGUAGE-add_custom_command)
-run_cmake(LINK_LANGUAGE-install)
-run_cmake(LINK_LANGUAGE-target_sources)
-run_cmake(LINK_LANGUAGE-add_executable)
-run_cmake(LINK_LANGUAGE-add_library)
-run_cmake(LINK_LANGUAGE-add_test)
-run_cmake(LINK_LANGUAGE-unknown-lang)
-run_cmake(LINK_LANGUAGE-wrong-usage1)
-run_cmake(LINK_LANGUAGE-wrong-usage2)
-run_cmake(LINK_LANGUAGE-wrong-usage3)
-run_cmake(LINK_LANGUAGE-wrong-usage4)
-run_cmake(LINK_LANGUAGE-file_generate)
+run_cmake(add_custom_target)
+run_cmake(add_custom_command)
+run_cmake(install)
+run_cmake(target_sources)
+run_cmake(add_executable)
+run_cmake(add_library)
+run_cmake(add_test)
+run_cmake(unknown-lang)
+run_cmake(wrong-usage1)
+run_cmake(wrong-usage2)
+run_cmake(wrong-usage3)
+run_cmake(wrong-usage4)
+run_cmake(file_generate)
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_command-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_command-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_command-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_command-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_library-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_command-stderr.txt
index 1bacdeb4c8..2ac7add765 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_library-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_command-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANGUAGE-add_library.cmake:1 \(add_library\):
+CMake Error at add_custom_command.cmake:2 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<LINK_LANGUAGE>
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_command.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_command.cmake
index a378c1c0db..a378c1c0db 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_command.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_command.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_target-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_target-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_target-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_target-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_executable-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_target-stderr.txt
index 3bdc8e493e..5e54baefdf 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_executable-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_target-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANGUAGE-add_executable.cmake:1 \(add_executable\):
+CMake Error at add_custom_target.cmake:1 \(add_custom_target\):
   Error evaluating generator expression:
 
     \$<LINK_LANGUAGE>
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_target.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_target.cmake
index 60b6c75f20..60b6c75f20 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_custom_target.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_custom_target.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_executable-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_executable-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_executable-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_executable-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_test-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_executable-stderr.txt
index f22efde7ec..06c00fcfee 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_test-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_executable-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANGUAGE-add_test.cmake:5 \(add_test\):
+CMake Error at add_executable.cmake:1 \(add_executable\):
   Error evaluating generator expression:
 
     \$<LINK_LANGUAGE>
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_executable.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_executable.cmake
index 2176b39239..2176b39239 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_executable.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_executable.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_library-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_library-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_library-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_library-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-file_generate-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_library-stderr.txt
index 21d26de5f1..6e312a14e8 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-file_generate-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_library-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANGUAGE-file_generate.cmake:3 \(file\):
+CMake Error at add_library.cmake:1 \(add_library\):
   Error evaluating generator expression:
 
     \$<LINK_LANGUAGE>
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_library.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_library.cmake
index 253f82a364..253f82a364 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_library.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_library.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_test-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_test-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_test-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_test-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_test-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_test-stderr.txt
new file mode 100644
index 0000000000..3deb92326e
--- /dev/null
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_test-stderr.txt
@@ -0,0 +1,9 @@
+CMake Error at add_test.cmake:5 \(add_test\):
+  Error evaluating generator expression:
+
+    \$<LINK_LANGUAGE>
+
+  \$<LINK_LANGUAGE:...> may only be used with binary targets to specify link
+  libraries, link directories, link options and link depends.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_test.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_test.cmake
index 4fd547d54b..4fd547d54b 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-add_test.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/add_test.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-file_generate-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/file_generate-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-file_generate-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/file_generate-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/file_generate-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/file_generate-stderr.txt
new file mode 100644
index 0000000000..0e3d6814e6
--- /dev/null
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/file_generate-stderr.txt
@@ -0,0 +1,9 @@
+CMake Error at file_generate.cmake:3 \(file\):
+  Error evaluating generator expression:
+
+    \$<LINK_LANGUAGE>
+
+  \$<LINK_LANGUAGE:...> may only be used with binary targets to specify link
+  libraries, link directories, link options and link depends.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-file_generate.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/file_generate.cmake
index 519b883c42..519b883c42 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-file_generate.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/file_generate.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-install-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/install-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-install-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/install-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-install-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/install-stderr.txt
index 73afc33771..73afc33771 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-install-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/install-stderr.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-install.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/install.cmake
index 533c0b4590..533c0b4590 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-install.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/install.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-target_sources-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/target_sources-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-target_sources-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/target_sources-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/target_sources-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/target_sources-stderr.txt
new file mode 100644
index 0000000000..4c63a6e6c9
--- /dev/null
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/target_sources-stderr.txt
@@ -0,0 +1,9 @@
+CMake Error at target_sources.cmake:2 \(target_sources\):
+  Error evaluating generator expression:
+
+    \$<LINK_LANGUAGE>
+
+  \$<LINK_LANGUAGE:...> may only be used with binary targets to specify link
+  libraries, link directories, link options and link depends.
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-target_sources.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/target_sources.cmake
index c134c0197e..c134c0197e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-target_sources.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/target_sources.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-unknown-lang.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/unknown-lang.cmake
index 0ba472d7b7..0ba472d7b7 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-unknown-lang.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/unknown-lang.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage1-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage1-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage1-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage1-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage2-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage1-stderr.txt
index 7fe43101bc..58562b3b71 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage2-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage1-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANGUAGE-wrong-usage2.cmake:4 \(target_compile_options\):
+CMake Error at wrong-usage1.cmake:4 \(target_compile_definitions\):
   Error evaluating generator expression:
 
     \$<LINK_LANGUAGE:C>
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage1.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage1.cmake
index 90b7ce0330..90b7ce0330 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage1.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage1.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage2-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage2-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage2-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage2-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage3-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage2-stderr.txt
index cb20e996de..46fbc67495 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage3-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage2-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANGUAGE-wrong-usage3.cmake:4 \(target_include_directories\):
+CMake Error at wrong-usage2.cmake:4 \(target_compile_options\):
   Error evaluating generator expression:
 
     \$<LINK_LANGUAGE:C>
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage2.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage2.cmake
index e761897ed1..e761897ed1 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage2.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage2.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage3-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage3-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage3-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage3-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage1-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage3-stderr.txt
index 1e3a83b927..2cabc90482 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage1-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage3-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANGUAGE-wrong-usage1.cmake:4 \(target_compile_definitions\):
+CMake Error at wrong-usage3.cmake:4 \(target_include_directories\):
   Error evaluating generator expression:
 
     \$<LINK_LANGUAGE:C>
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage3.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage3.cmake
index 96a72a1882..96a72a1882 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage3.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage3.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage4-result.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage4-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage4-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage4-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage4-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage4-stderr.txt
index ee36912dfe..3679760049 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage4-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage4-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANGUAGE-wrong-usage4.cmake:7 \(target_link_libraries\):
+CMake Error at wrong-usage4.cmake:7 \(target_link_libraries\):
   Error evaluating generator expression:
 
     \$<LINK_LANGUAGE>
diff --git a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage4.cmake b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage4.cmake
index 3ecaabbe42..3ecaabbe42 100644
--- a/Tests/RunCMake/GenEx-LINK_LANGUAGE/LINK_LANGUAGE-wrong-usage4.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANGUAGE/wrong-usage4.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/RunCMakeTest.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/RunCMakeTest.cmake
index 5bb6590a6c..74a179c25a 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/RunCMakeTest.cmake
@@ -1,14 +1,14 @@
 include(RunCMake)
 
-run_cmake(LINK_LANG_AND_ID-add_custom_target)
-run_cmake(LINK_LANG_AND_ID-add_custom_command)
-run_cmake(LINK_LANG_AND_ID-install)
-run_cmake(LINK_LANG_AND_ID-target_sources)
-run_cmake(LINK_LANG_AND_ID-add_executable)
-run_cmake(LINK_LANG_AND_ID-add_library)
-run_cmake(LINK_LANG_AND_ID-add_test)
-run_cmake(LINK_LANG_AND_ID-unknown-lang)
-run_cmake(LINK_LANG_AND_ID-wrong-usage1)
-run_cmake(LINK_LANG_AND_ID-wrong-usage2)
-run_cmake(LINK_LANG_AND_ID-wrong-usage3)
-run_cmake(LINK_LANG_AND_ID-file_generate)
+run_cmake(add_custom_target)
+run_cmake(add_custom_command)
+run_cmake(install)
+run_cmake(target_sources)
+run_cmake(add_executable)
+run_cmake(add_library)
+run_cmake(add_test)
+run_cmake(unknown-lang)
+run_cmake(wrong-usage1)
+run_cmake(wrong-usage2)
+run_cmake(wrong-usage3)
+run_cmake(file_generate)
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_command-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_command-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_command-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_command-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_target-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_command-stderr.txt
index 0749c449aa..412e3adb25 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_target-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_command-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANG_AND_ID-add_custom_target.cmake:2 \(add_custom_target\):
+CMake Error at add_custom_command.cmake:2 \(add_custom_command\):
   Error evaluating generator expression:
 
     \$<LINK_LANG_AND_ID:LANG,ID>
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_command.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_command.cmake
index 9df923232c..9df923232c 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_command.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_command.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_target-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_target-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_target-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_target-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_command-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_target-stderr.txt
index 2ff62bc424..a927b208ae 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_command-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_target-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANG_AND_ID-add_custom_command.cmake:2 \(add_custom_command\):
+CMake Error at add_custom_target.cmake:2 \(add_custom_target\):
   Error evaluating generator expression:
 
     \$<LINK_LANG_AND_ID:LANG,ID>
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_target.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_target.cmake
index e5f76bcd11..e5f76bcd11 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_custom_target.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_custom_target.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_executable-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_executable-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_executable-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_executable-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_library-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_executable-stderr.txt
index be46e287a1..c58cbdf126 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_library-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_executable-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANG_AND_ID-add_library.cmake:2 \(add_library\):
+CMake Error at add_executable.cmake:1 \(add_executable\):
   Error evaluating generator expression:
 
     \$<LINK_LANG_AND_ID:C,MSVC>
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_executable.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_executable.cmake
index 4d6c674828..4d6c674828 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_executable.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_executable.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_library-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_library-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_library-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_library-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_executable-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_library-stderr.txt
index 595312a72f..46a32d0200 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_executable-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_library-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANG_AND_ID-add_executable.cmake:1 \(add_executable\):
+CMake Error at add_library.cmake:2 \(add_library\):
   Error evaluating generator expression:
 
     \$<LINK_LANG_AND_ID:C,MSVC>
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_library.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_library.cmake
index a8199cf862..a8199cf862 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_library.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_library.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_test-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_test-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_test-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_test-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_test-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_test-stderr.txt
index 2a29492e84..989329868d 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_test-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_test-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANG_AND_ID-add_test.cmake:5 \(add_test\):
+CMake Error at add_test.cmake:5 \(add_test\):
   Error evaluating generator expression:
 
     \$<LINK_LANG_AND_ID:CXX,GNU>
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_test.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_test.cmake
index fd700d796e..fd700d796e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-add_test.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/add_test.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-file_generate-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/file_generate-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-file_generate-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/file_generate-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-file_generate-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/file_generate-stderr.txt
index e57b55c1c7..fa05f8d901 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-file_generate-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/file_generate-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANG_AND_ID-file_generate.cmake:3 \(file\):
+CMake Error at file_generate.cmake:3 \(file\):
   Error evaluating generator expression:
 
     \$<LINK_LANG_AND_ID:C,GNU>
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-file_generate.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/file_generate.cmake
index 67c1bdacdb..67c1bdacdb 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-file_generate.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/file_generate.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-install-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/install-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-install-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/install-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-install-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/install-stderr.txt
index 965f974cb5..965f974cb5 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-install-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/install-stderr.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-install.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/install.cmake
index b8f93233cf..b8f93233cf 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-install.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/install.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-target_sources-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/target_sources-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-target_sources-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/target_sources-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-target_sources-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/target_sources-stderr.txt
index e86602a0f1..aecf1245b2 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-target_sources-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/target_sources-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANG_AND_ID-target_sources.cmake:2 \(target_sources\):
+CMake Error at target_sources.cmake:2 \(target_sources\):
   Error evaluating generator expression:
 
     \$<LINK_LANG_AND_ID>
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-target_sources.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/target_sources.cmake
index da5faf4904..da5faf4904 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-target_sources.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/target_sources.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-unknown-lang.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/unknown-lang.cmake
index 99dd337605..99dd337605 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-unknown-lang.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/unknown-lang.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage1-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage1-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage1-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage1-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage2-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage1-stderr.txt
index 53bdcb2a50..729cc2f1ae 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage2-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage1-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANG_AND_ID-wrong-usage2.cmake:4 \(target_compile_options\):
+CMake Error at wrong-usage1.cmake:4 \(target_compile_definitions\):
   Error evaluating generator expression:
 
     \$<LINK_LANG_AND_ID:C,GNU>
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage1.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage1.cmake
index e58e3b449b..e58e3b449b 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage1.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage1.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage2-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage2-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage2-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage2-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage3-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage2-stderr.txt
index a34a2ea579..786c16d1c7 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage3-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage2-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANG_AND_ID-wrong-usage3.cmake:4 \(target_include_directories\):
+CMake Error at wrong-usage2.cmake:4 \(target_compile_options\):
   Error evaluating generator expression:
 
     \$<LINK_LANG_AND_ID:C,GNU>
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage2.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage2.cmake
index 998daa9b7e..998daa9b7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage2.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage2.cmake
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage3-result.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage3-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage3-result.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage3-result.txt
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage1-stderr.txt b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage3-stderr.txt
index 95611c310f..31679a125f 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage1-stderr.txt
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage3-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at LINK_LANG_AND_ID-wrong-usage1.cmake:4 \(target_compile_definitions\):
+CMake Error at wrong-usage3.cmake:4 \(target_include_directories\):
   Error evaluating generator expression:
 
     \$<LINK_LANG_AND_ID:C,GNU>
diff --git a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage3.cmake b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage3.cmake
index 0543056380..0543056380 100644
--- a/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/LINK_LANG_AND_ID-wrong-usage3.cmake
+++ b/Tests/RunCMake/GenEx-LINK_LANG_AND_ID/wrong-usage3.cmake
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/RunCMakeTest.cmake b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/RunCMakeTest.cmake
index edc495c94c..a48b525bba 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/RunCMakeTest.cmake
@@ -1,7 +1,7 @@
 include(RunCMake)
 
-run_cmake(TARGET_RUNTIME_DLLS)
-run_cmake(TARGET_RUNTIME_DLLS-static)
-run_cmake(TARGET_RUNTIME_DLLS-target_link_libraries)
-run_cmake(TARGET_RUNTIME_DLLS-target_link_libraries-cycle1)
-run_cmake(TARGET_RUNTIME_DLLS-target_link_libraries-cycle2)
+run_cmake(shared)
+run_cmake(static)
+run_cmake(target_link_libraries)
+run_cmake(target_link_libraries-cycle1)
+run_cmake(target_link_libraries-cycle2)
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-check.cmake b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/check.cmake
index e19598e144..e19598e144 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-check.cmake
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/check.cmake
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS.cmake b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/shared.cmake
index 806f0b60f2..806f0b60f2 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS.cmake
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/shared.cmake
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-static-result.txt b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/static-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-static-result.txt
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/static-result.txt
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-static-stderr.txt b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/static-stderr.txt
index 7ce588a742..af68c9689a 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-static-stderr.txt
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/static-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at TARGET_RUNTIME_DLLS-static\.cmake:[0-9]+ \(file\):
+CMake Error at static\.cmake:[0-9]+ \(file\):
   Error evaluating generator expression:
 
     \$<TARGET_RUNTIME_DLLS:static>
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-static.cmake b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/static.cmake
index dc900ddf19..dc900ddf19 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-static.cmake
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/static.cmake
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle1-result.txt b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle1-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle1-result.txt
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle1-result.txt
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle1-stderr.txt b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle1-stderr.txt
index 8cfcf7e41a..b6ae09941e 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle1-stderr.txt
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle1-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at TARGET_RUNTIME_DLLS-target_link_libraries-cycle1\.cmake:[0-9]+ \(add_library\):
+CMake Error at target_link_libraries-cycle1\.cmake:[0-9]+ \(add_library\):
   The SOURCES of "lib1" use a generator expression that depends on the
   SOURCES themselves\.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle1.cmake b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle1.cmake
index f19e9e6a73..f19e9e6a73 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle1.cmake
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle1.cmake
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle2-result.txt b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle2-result.txt
index d00491fd7e..d00491fd7e 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle2-result.txt
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle2-result.txt
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle2-stderr.txt b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle2-stderr.txt
index bacbf63b7d..9a845f967e 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle2-stderr.txt
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle2-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at TARGET_RUNTIME_DLLS-target_link_libraries-cycle2\.cmake:[0-9]+ \(add_library\):
+CMake Error at target_link_libraries-cycle2\.cmake:[0-9]+ \(add_library\):
   The SOURCES of "(lib1|lib2)" use a generator expression that depends on the
   SOURCES themselves\.
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle2.cmake b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle2.cmake
index 7d035bd876..7d035bd876 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries-cycle2.cmake
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries-cycle2.cmake
diff --git a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries.cmake b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries.cmake
index f44dbf4b18..f44dbf4b18 100644
--- a/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/TARGET_RUNTIME_DLLS-target_link_libraries.cmake
+++ b/Tests/RunCMake/GenEx-TARGET_RUNTIME_DLLS/target_link_libraries.cmake