[Cmake-commits] CMake branch, next, updated. v3.1.2-1125-g0d4ba3c

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0d4ba3c93ba7d30587eaf9ede129ff94801dda91 (commit)
       via  32d0e398fd2739881a2755c1d24b11a304edbfe4 (commit)
      from  e09df3a8536a8f0e0b426ddeb628ac58d418489b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d4ba3c93ba7d30587eaf9ede129ff94801dda91
commit 0d4ba3c93ba7d30587eaf9ede129ff94801dda91
Merge: e09df3a 32d0e39
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 13:37:38 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 9 13:37:38 2015 -0500

    Merge topic 'export-interface-source-files' into next
    
    32d0e398 Revert topic


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32d0e398fd2739881a2755c1d24b11a304edbfe4
commit 32d0e398fd2739881a2755c1d24b11a304edbfe4
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 9 19:36:30 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 9 19:36:48 2015 +0100

    Revert topic

diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst
index d6f148d..832240a 100644
--- a/Help/command/target_sources.rst
+++ b/Help/command/target_sources.rst
@@ -22,6 +22,10 @@ items will populate the :prop_tgt:`SOURCES` property of
 following arguments specify sources.  Repeated calls for the same
 ``<target>`` append items in the order called.
 
+Targets with :prop_tgt:`INTERFACE_SOURCES` may not be exported with the
+:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
+lifted in a future version of CMake.
+
 Arguments to ``target_sources`` may use "generator expressions"
 with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Help/prop_tgt/INTERFACE_SOURCES.rst b/Help/prop_tgt/INTERFACE_SOURCES.rst
index a224b68..696ee95 100644
--- a/Help/prop_tgt/INTERFACE_SOURCES.rst
+++ b/Help/prop_tgt/INTERFACE_SOURCES.rst
@@ -12,6 +12,10 @@ When target dependencies are specified using :command:`target_link_libraries`,
 CMake will read this property from all target dependencies to determine the
 sources of the consumer.
 
+Targets with ``INTERFACE_SOURCES`` may not be exported with the
+:command:`export` or :command:`install(EXPORT)` commands. This limitation may be
+lifted in a future version of CMake.
+
 Contents of ``INTERFACE_SOURCES`` may use "generator expressions"
 with the syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)`
 manual for available expressions.  See the :manual:`cmake-buildsystem(7)`
diff --git a/Help/release/dev/export-interface-source-files.rst b/Help/release/dev/export-interface-source-files.rst
deleted file mode 100644
index 00dcd25..0000000
--- a/Help/release/dev/export-interface-source-files.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-export-interface-source-files
------------------------------
-
-* It is now possible to export targets which populate the
-  :prop_tgt:`INTERFACE_SOURCES` target property using the
-  :command:`install(EXPORT)` and :command:`export()` commands.
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index b1203dd..a28ec48 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -68,6 +68,16 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
       tei != this->Exports.end(); ++tei)
     {
     cmTarget* te = *tei;
+    if (te->GetProperty("INTERFACE_SOURCES"))
+      {
+      std::ostringstream e;
+      e << "Target \""
+        << te->GetName()
+        << "\" has a populated INTERFACE_SOURCES property.  This is not "
+          "currently supported.";
+      cmSystemTools::Error(e.str().c_str());
+      return false;
+      }
     this->GenerateImportTargetCode(os, te);
 
     te->AppendBuildInterfaceIncludes();
@@ -77,9 +87,6 @@ bool cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateInterfaceProperty("INTERFACE_INCLUDE_DIRECTORIES", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
-    this->PopulateInterfaceProperty("INTERFACE_SOURCES", te,
-                                    cmGeneratorExpression::BuildInterface,
-                                    properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_COMPILE_DEFINITIONS", te,
                                     cmGeneratorExpression::BuildInterface,
                                     properties, missingTargets);
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 71728be..af4ce8b 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -224,7 +224,7 @@ static bool isSubDirectory(const char* a, const char* b)
 
 //----------------------------------------------------------------------------
 static bool checkInterfaceDirs(const std::string &prepro,
-                      cmTarget *target, const std::string& prop)
+                      cmTarget *target)
 {
   const char* installDir =
             target->GetMakefile()->GetSafeDefinition("CMAKE_INSTALL_PREFIX");
@@ -250,27 +250,20 @@ static bool checkInterfaceDirs(const std::string &prepro,
     std::ostringstream e;
     if (genexPos != std::string::npos)
       {
-      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
+      switch (target->GetPolicyStatusCMP0041())
         {
-        switch (target->GetPolicyStatusCMP0041())
-          {
-          case cmPolicies::WARN:
-            messageType = cmake::WARNING;
-            e << target->GetMakefile()->GetPolicies()
-                        ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
-            break;
-          case cmPolicies::OLD:
-            continue;
-          case cmPolicies::REQUIRED_IF_USED:
-          case cmPolicies::REQUIRED_ALWAYS:
-          case cmPolicies::NEW:
-            hadFatalError = true;
-            break; // Issue fatal message.
-          }
-        }
-      else
-        {
-        hadFatalError = true;
+        case cmPolicies::WARN:
+          messageType = cmake::WARNING;
+          e << target->GetMakefile()->GetPolicies()
+                      ->GetPolicyWarning(cmPolicies::CMP0041) << "\n";
+          break;
+        case cmPolicies::OLD:
+          continue;
+        case cmPolicies::REQUIRED_IF_USED:
+        case cmPolicies::REQUIRED_ALWAYS:
+        case cmPolicies::NEW:
+          hadFatalError = true;
+          break; // Issue fatal message.
         }
       }
     if (cmHasLiteralPrefix(li->c_str(), "${_IMPORT_PREFIX}"))
@@ -279,8 +272,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (!cmSystemTools::FileIsFullPath(li->c_str()))
       {
-      e << "Target \"" << target->GetName() << "\" " << prop <<
-           " property contains relative path:\n"
+      e << "Target \"" << target->GetName() << "\" "
+           "INTERFACE_INCLUDE_DIRECTORIES property contains relative path:\n"
            "  \"" << *li << "\"";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -296,35 +289,32 @@ static bool checkInterfaceDirs(const std::string &prepro,
         (!inBinary || isSubDirectory(installDir, topBinaryDir)) &&
         (!inSource || isSubDirectory(installDir, topSourceDir));
 
-      if (prop == "INTERFACE_INCLUDE_DIRECTORIES")
+      if (!shouldContinue)
         {
-        if (!shouldContinue)
+        switch(target->GetPolicyStatusCMP0052())
           {
-          switch(target->GetPolicyStatusCMP0052())
+          case cmPolicies::WARN:
             {
-            case cmPolicies::WARN:
-              {
-              std::ostringstream s;
-              s << target->GetMakefile()->GetPolicies()
-                        ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
-              s << "Directory:\n    \"" << *li << "\"\nin "
-                "INTERFACE_INCLUDE_DIRECTORIES of target \""
-                << target->GetName() << "\" is a subdirectory of the install "
-                "directory:\n    \"" << installDir << "\"\nhowever it is also "
-                "a subdirectory of the " << (inBinary ? "build" : "source")
-                << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
-                << "\"" << std::endl;
-              target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
-                                                  s.str());
-              }
-            case cmPolicies::OLD:
-              shouldContinue = true;
-              break;
-            case cmPolicies::REQUIRED_ALWAYS:
-            case cmPolicies::REQUIRED_IF_USED:
-            case cmPolicies::NEW:
-              break;
+            std::ostringstream s;
+            s << target->GetMakefile()->GetPolicies()
+                      ->GetPolicyWarning(cmPolicies::CMP0052) << "\n";
+            s << "Directory:\n    \"" << *li << "\"\nin "
+              "INTERFACE_INCLUDE_DIRECTORIES of target \""
+              << target->GetName() << "\" is a subdirectory of the install "
+              "directory:\n    \"" << installDir << "\"\nhowever it is also "
+              "a subdirectory of the " << (inBinary ? "build" : "source")
+              << " tree:\n    \"" << (inBinary ? topBinaryDir : topSourceDir)
+              << "\"" << std::endl;
+            target->GetMakefile()->IssueMessage(cmake::AUTHOR_WARNING,
+                                                s.str());
             }
+          case cmPolicies::OLD:
+            shouldContinue = true;
+            break;
+          case cmPolicies::REQUIRED_ALWAYS:
+          case cmPolicies::REQUIRED_IF_USED:
+          case cmPolicies::NEW:
+            break;
           }
         }
       if (shouldContinue)
@@ -334,8 +324,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       }
     if (inBinary)
       {
-      e << "Target \"" << target->GetName() << "\" " << prop <<
-           " property contains path:\n"
+      e << "Target \"" << target->GetName() << "\" "
+           "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
            "  \"" << *li << "\"\nwhich is prefixed in the build directory.";
       target->GetMakefile()->IssueMessage(messageType, e.str());
       }
@@ -343,8 +333,8 @@ static bool checkInterfaceDirs(const std::string &prepro,
       {
       if (inSource)
         {
-        e << "Target \"" << target->GetName() << "\" " << prop <<
-            " property contains path:\n"
+        e << "Target \"" << target->GetName() << "\" "
+            "INTERFACE_INCLUDE_DIRECTORIES property contains path:\n"
             "  \"" << *li << "\"\nwhich is prefixed in the source directory.";
         target->GetMakefile()->IssueMessage(messageType, e.str());
         }
@@ -375,46 +365,6 @@ static void prefixItems(std::string &exportDirs)
 }
 
 //----------------------------------------------------------------------------
-void cmExportFileGenerator::PopulateSourcesInterface(
-                      cmTargetExport *tei,
-                      cmGeneratorExpression::PreprocessContext preprocessRule,
-                      ImportPropertyMap &properties,
-                      std::vector<std::string> &missingTargets)
-{
-  cmTarget *target = tei->Target;
-  assert(preprocessRule == cmGeneratorExpression::InstallInterface);
-
-  const char *propName = "INTERFACE_SOURCES";
-  const char *input = target->GetProperty(propName);
-
-  if (!input)
-    {
-    return;
-    }
-
-  if (!*input)
-    {
-    properties[propName] = "";
-    return;
-    }
-
-  std::string prepro = cmGeneratorExpression::Preprocess(input,
-                                                         preprocessRule,
-                                                         true);
-  if (!prepro.empty())
-    {
-    this->ResolveTargetsInGeneratorExpressions(prepro, target,
-                                                missingTargets);
-
-    if (!checkInterfaceDirs(prepro, target, propName))
-      {
-      return;
-      }
-    properties[propName] = prepro;
-    }
-}
-
-//----------------------------------------------------------------------------
 void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
                       cmTargetExport *tei,
                       cmGeneratorExpression::PreprocessContext preprocessRule,
@@ -474,7 +424,7 @@ void cmExportFileGenerator::PopulateIncludeDirectoriesInterface(
     this->ResolveTargetsInGeneratorExpressions(prepro, target,
                                                 missingTargets);
 
-    if (!checkInterfaceDirs(prepro, target, propName))
+    if (!checkInterfaceDirs(prepro, target))
       {
       return;
       }
diff --git a/Source/cmExportFileGenerator.h b/Source/cmExportFileGenerator.h
index b6f4166..919924e 100644
--- a/Source/cmExportFileGenerator.h
+++ b/Source/cmExportFileGenerator.h
@@ -139,11 +139,6 @@ protected:
                       cmGeneratorExpression::PreprocessContext preprocessRule,
                       ImportPropertyMap &properties,
                       std::vector<std::string> &missingTargets);
-  void PopulateSourcesInterface(
-                      cmTargetExport *target,
-                      cmGeneratorExpression::PreprocessContext preprocessRule,
-                      ImportPropertyMap &properties,
-                      std::vector<std::string> &missingTargets);
 
   void SetImportLinkInterface(const std::string& config,
                     std::string const& suffix,
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index a0d9013..98ed818 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -123,7 +123,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
   bool require2_8_12 = false;
   bool require3_0_0 = false;
-  bool require3_1_0 = false;
   bool requiresConfigFiles = false;
   // Create all the imported targets.
   for(std::vector<cmTargetExport*>::const_iterator
@@ -132,6 +131,17 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     {
     cmTarget* te = (*tei)->Target;
 
+    if (te->GetProperty("INTERFACE_SOURCES"))
+      {
+      std::ostringstream e;
+      e << "Target \""
+        << te->GetName()
+        << "\" has a populated INTERFACE_SOURCES property.  This is not "
+          "currently supported.";
+      cmSystemTools::Error(e.str().c_str());
+      return false;
+      }
+
     requiresConfigFiles = requiresConfigFiles
                               || te->GetType() != cmTarget::INTERFACE_LIBRARY;
 
@@ -142,9 +152,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->PopulateIncludeDirectoriesInterface(*tei,
                                   cmGeneratorExpression::InstallInterface,
                                   properties, missingTargets);
-    this->PopulateSourcesInterface(*tei,
-                                  cmGeneratorExpression::InstallInterface,
-                                  properties, missingTargets);
     this->PopulateInterfaceProperty("INTERFACE_SYSTEM_INCLUDE_DIRECTORIES",
                                   te,
                                   cmGeneratorExpression::InstallInterface,
@@ -183,13 +190,6 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
       {
       require3_0_0 = true;
       }
-    if(te->GetProperty("INTERFACE_SOURCES"))
-      {
-      // We can only generate INTERFACE_SOURCES in CMake 3.3, but CMake 3.1
-      // can consume them.
-      require3_1_0 = true;
-      }
-
     this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
                                   te, properties);
     this->PopulateCompatibleInterfaceProperties(te, properties);
@@ -197,11 +197,7 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
     this->GenerateInterfaceProperties(te, os, properties);
     }
 
-  if (require3_1_0)
-    {
-    this->GenerateRequiredCMakeVersion(os, "3.1.0");
-    }
-  else if (require3_0_0)
+  if (require3_0_0)
     {
     this->GenerateRequiredCMakeVersion(os, "3.0.0");
     }
diff --git a/Tests/ExportImport/Export/Interface/CMakeLists.txt b/Tests/ExportImport/Export/Interface/CMakeLists.txt
index 00a5375..523fc29 100644
--- a/Tests/ExportImport/Export/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Export/Interface/CMakeLists.txt
@@ -29,17 +29,7 @@ target_compile_features(use_auto_type INTERFACE cxx_auto_type)
 add_library(use_c_restrict INTERFACE)
 target_compile_features(use_c_restrict INTERFACE c_restrict)
 
-add_library(source_target INTERFACE)
-target_sources(source_target INTERFACE
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source_target.cpp>
-  $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/src/source_target_for_install.cpp>
-)
-install(FILES
-  source_target_for_install.cpp
-  DESTINATION src
-)
-
-install(TARGETS headeronly sharediface use_auto_type use_c_restrict source_target
+install(TARGETS headeronly sharediface use_auto_type use_c_restrict
   EXPORT expInterface
 )
 install(TARGETS sharedlib
diff --git a/Tests/ExportImport/Export/Interface/source_target.cpp b/Tests/ExportImport/Export/Interface/source_target.cpp
deleted file mode 100644
index 037191c..0000000
--- a/Tests/ExportImport/Export/Interface/source_target.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifndef USE_FROM_BUILD_DIR
-#error Expected define USE_FROM_BUILD_DIR
-#endif
-
-#ifdef USE_FROM_INSTALL_DIR
-#error Unexpected define USE_FROM_INSTALL_DIR
-#endif
-
-int source_symbol()
-{
-  return 42;
-}
diff --git a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp b/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
deleted file mode 100644
index 64514ed..0000000
--- a/Tests/ExportImport/Export/Interface/source_target_for_install.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifdef USE_FROM_BUILD_DIR
-#error Unexpected define USE_FROM_BUILD_DIR
-#endif
-
-#ifndef USE_FROM_INSTALL_DIR
-#error Expected define USE_FROM_INSTALL_DIR
-#endif
-
-int source_symbol()
-{
-  return 42;
-}
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index 51d518e..4028405 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -82,14 +82,6 @@ endmacro()
 
 do_try_compile(bld)
 
-add_executable(source_target_test_bld source_target_test.cpp)
-target_link_libraries(source_target_test_bld bld::source_target)
-target_compile_definitions(source_target_test_bld PRIVATE USE_FROM_BUILD_DIR)
-
-add_executable(source_target_test_exp source_target_test.cpp)
-target_link_libraries(source_target_test_exp exp::source_target)
-target_compile_definitions(source_target_test_exp PRIVATE USE_FROM_INSTALL_DIR)
-
 add_executable(headeronlytest_exp headeronlytest.cpp)
 target_link_libraries(headeronlytest_exp exp::headeronly)
 
diff --git a/Tests/ExportImport/Import/Interface/source_target_test.cpp b/Tests/ExportImport/Import/Interface/source_target_test.cpp
deleted file mode 100644
index 0e8ec5f..0000000
--- a/Tests/ExportImport/Import/Interface/source_target_test.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-extern int source_symbol();
-
-int main()
-{
-  return source_symbol() - 42;
-}
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt b/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt b/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt b/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt b/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt b/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt b/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt b/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt b/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt b/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt b/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt b/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt b/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt b/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt b/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 6519682..801655f 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -1,28 +1,17 @@
 # See adjacent README.rst for documentation of this test infrastructure.
 
 macro(add_RunCMake_test test)
-  set(TEST_ARGS ${ARGN})
-  if ("${ARGV1}" STREQUAL "TEST_DIR")
-    if ("${ARGV2}" STREQUAL "")
-      message(FATAL_ERROR "Invalid args")
-    endif()
-    set(Test_Dir ${ARGV2})
-    list(REMOVE_AT TEST_ARGS 0)
-    list(REMOVE_AT TEST_ARGS 0)
-  else()
-    set(Test_Dir ${test})
-  endif()
   add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND}
     -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
     -DRunCMake_GENERATOR=${CMAKE_GENERATOR}
     -DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
     -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
     -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
+    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
     -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
     ${${test}_ARGS}
-    ${TEST_ARGS}
-    -P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
+    ${ARGN}
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
     )
 endmacro()
 
@@ -189,12 +178,6 @@ add_RunCMake_test(install)
 add_RunCMake_test(CPackInstallProperties)
 add_RunCMake_test(ExternalProject)
 
-set(build-property-paths_INCLUDE_DIRECTORIES_ARGS -DTEST_PROP=INCLUDE_DIRECTORIES)
-add_RunCMake_test(build-property-paths_INCLUDE_DIRECTORIES TEST_DIR build-property-paths)
-
-set(build-property-paths_SOURCES_ARGS -DTEST_PROP=SOURCES)
-add_RunCMake_test(build-property-paths_SOURCES TEST_DIR build-property-paths)
-
 if(RPMBUILD)
   add_RunCMake_test(CPackRPM)
 endif()
diff --git a/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt b/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt b/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt b/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt b/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake
index 6389ef4..33b745d 100644
--- a/Tests/RunCMake/RunCMake.cmake
+++ b/Tests/RunCMake/RunCMake.cmake
@@ -18,10 +18,7 @@ function(run_cmake test)
     set(expect_result 0)
   endif()
   foreach(o out err)
-    if(RunCMake-std${o}-file AND EXISTS ${top_src}/${RunCMake-std${o}-file})
-      file(READ ${top_src}/${RunCMake-std${o}-file} expect_std${o})
-      string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
-    elseif(EXISTS ${top_src}/${test}-std${o}.txt)
+    if(EXISTS ${top_src}/${test}-std${o}.txt)
       file(READ ${top_src}/${test}-std${o}.txt expect_std${o})
       string(REGEX REPLACE "\n+$" "" expect_std${o} "${expect_std${o}}")
     else()
diff --git a/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt b/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt b/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt b/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-result.txt b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
index 573541a..d00491f 100644
--- a/Tests/RunCMake/TargetSources/ExportBuild-result.txt
+++ b/Tests/RunCMake/TargetSources/ExportBuild-result.txt
@@ -1 +1 @@
-0
+1
diff --git a/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt b/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
new file mode 100644
index 0000000..0d65a55
--- /dev/null
+++ b/Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
@@ -0,0 +1 @@
+CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/TargetSources/ExportInstall-result.txt
similarity index 100%
copy from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt
copy to Tests/RunCMake/TargetSources/ExportInstall-result.txt
diff --git a/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt b/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
new file mode 100644
index 0000000..0d65a55
--- /dev/null
+++ b/Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
@@ -0,0 +1 @@
+CMake Error: Target "iface" has a populated INTERFACE_SOURCES property.  This is not currently supported.
diff --git a/Tests/RunCMake/TargetSources/ExportInstall.cmake b/Tests/RunCMake/TargetSources/ExportInstall.cmake
new file mode 100644
index 0000000..8e7c9f9
--- /dev/null
+++ b/Tests/RunCMake/TargetSources/ExportInstall.cmake
@@ -0,0 +1,6 @@
+
+add_library(iface INTERFACE)
+target_sources(iface INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/empty_1.cpp")
+
+install(TARGETS iface EXPORT exp)
+install(EXPORT exp DESTINATION cmake)
diff --git a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
index 4416ef9..1b4ef0b 100644
--- a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
+++ b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
@@ -10,3 +10,4 @@ endif()
 run_cmake(CMP0026-LOCATION)
 run_cmake(RelativePathInInterface)
 run_cmake(ExportBuild)
+run_cmake(ExportInstall)
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
deleted file mode 100644
index fa39ff8..0000000
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths_SOURCES/prefix/BinInInstallPrefix-build/empty.cpp"
-
-  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
deleted file mode 100644
index bed2424..0000000
--- a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths_SOURCES/BinaryDirectoryInInterface-build/empty.cpp"
-
-  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake b/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
deleted file mode 100644
index 7001f3f..0000000
--- a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-
-enable_language(CXX)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/foo")
-else()
-  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/empty.cpp")
-endif()
-
-install(TARGETS testTarget EXPORT testTargets
-  DESTINATION lib
-)
-
-install(EXPORT testTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/build-property-paths/CMakeLists.txt b/Tests/RunCMake/build-property-paths/CMakeLists.txt
deleted file mode 100644
index 5cd4825..0000000
--- a/Tests/RunCMake/build-property-paths/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-project(${RunCMake_TEST} NONE)
-if(NOT TEST_FILE)
-  set(TEST_FILE ${RunCMake_TEST}.cmake)
-endif()
-include(${TEST_FILE})
diff --git a/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake b/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
deleted file mode 100644
index f5f3005..0000000
--- a/Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-enable_language(CXX)
-add_library(testTarget empty.cpp)
-
-if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/dir")
-else()
-  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_INSTALL_PREFIX}/empty.cpp")
-endif()
-
-install(TARGETS testTarget EXPORT testTargets
-  DESTINATION lib
-)
-
-install(EXPORT testTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
deleted file mode 100644
index 02a8198..0000000
--- a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths_SOURCES/InstallInBinDir-build/empty.cpp"
-
-  which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
deleted file mode 100644
index aece1ab..0000000
--- a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths_SOURCES/copy/empty.cpp"
-
-  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
deleted file mode 100644
index 2311af9..0000000
--- a/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" contains relative path in its INTERFACE_SOURCES:
-
-    "empty.cpp"
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake b/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
deleted file mode 100644
index 489c3a1..0000000
--- a/Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-
-enable_language(CXX)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-
-if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
-else()
-  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "$<1:empty.cpp>")
-endif()
-
-add_library(userTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_link_libraries(userTarget testTarget)
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
deleted file mode 100644
index f0f002c..0000000
--- a/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains relative path:
-
-    "empty.cpp"
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake b/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
deleted file mode 100644
index e974aac..0000000
--- a/Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-
-enable_language(CXX)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
-else()
-  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "empty.cpp")
-endif()
-install(TARGETS testTarget EXPORT testTargets
-  DESTINATION lib
-)
-
-install(EXPORT testTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake b/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
deleted file mode 100644
index 54d0cd8..0000000
--- a/Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
+++ /dev/null
@@ -1,155 +0,0 @@
-include(RunCMake)
-
-macro(run_cmake test)
-  list(APPEND RunCMake_TEST_OPTIONS -DTEST_PROP=${TEST_PROP})
-  set(RunCMake-stderr-file ${test}-stderr_${TEST_PROP}.txt)
-  _run_cmake(${test})
-endmacro()
-
-run_cmake(RelativePathInInterface)
-run_cmake(RelativePathInGenex)
-run_cmake(export-NOWARN)
-run_cmake(SourceDirectoryInInterface)
-run_cmake(BinaryDirectoryInInterface)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/DirInInstallPrefix/prefix")
-run_cmake(DirInInstallPrefix)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/copy/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/copy/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
-  COPYONLY
-)
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/copy")
-run_cmake(InstallInSrcDir)
-unset(RunCMake_TEST_SOURCE_DIR)
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix")
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix"
-  "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
-  )
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/InstallInBinDir-build")
-run_cmake(InstallInBinDir)
-unset(RunCMake_TEST_BINARY_DIR)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/prefix/src/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/prefix/src/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
-  COPYONLY
-)
-
-foreach(policyStatus NEW OLD "")
-  if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-    if (NOT "${policyStatus}" STREQUAL "")
-      set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
-    else()
-      unset(policyOption)
-      set(policyStatus WARN)
-    endif()
-    set(policySuffix -CMP0052-${policyStatus})
-  endif()
-  set(RunCMake_TEST_OPTIONS
-    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
-    "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
-    )
-  # Set the RunCMake_TEST_SOURCE_DIR here to the copy too. This is needed to run
-  # the test suite in-source properly.  Otherwise the install directory would be
-  # a subdirectory or the source directory, which is allowed and tested separately
-  # below.
-  set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
-  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix${policySuffix}-build")
-  run_cmake(BinInInstallPrefix${policySuffix})
-  unset(RunCMake_TEST_BINARY_DIR)
-
-  set(RunCMake_TEST_OPTIONS
-    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
-    "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
-    )
-  run_cmake(SrcInInstallPrefix${policySuffix})
-  unset(RunCMake_TEST_SOURCE_DIR)
-
-  if (NOT TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-    break()
-  endif()
-endforeach()
-
-set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix")
-run_cmake(InstallPrefixInInterface)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/installToSrc/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/installToSrc/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
-  COPYONLY
-)
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrc")
-run_cmake(InstallToPrefixInSrcDirOutOfSource)
-unset(RunCMake_TEST_SOURCE_DIR)
-
-file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}/installToSrcInSrc")
-set(RunCMake_TEST_NO_CLEAN ON)
-
-configure_file(
-  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/CMakeLists.txt"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/empty.cpp"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/empty.cpp"
-  COPYONLY
-)
-configure_file(
-  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
-  "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
-  COPYONLY
-)
-
-set(RunCMake_TEST_OPTIONS
-  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface/prefix"
-  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
-  )
-set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
-set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
-run_cmake(InstallToPrefixInSrcDirInSource)
-unset(RunCMake_TEST_SOURCE_DIR)
-unset(RunCMake_TEST_BINARY_DIR)
-unset(RunCMake_TEST_NO_CLEAN)
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
deleted file mode 100644
index 187ccdf..0000000
--- a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths/empty.cpp"
-
-  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake b/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
deleted file mode 100644
index d80cbec..0000000
--- a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-
-enable_language(CXX)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-if (TEST_PROP STREQUAL INCLUDE_DIRECTORIES)
-  set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/foo")
-else()
-  set_property(TARGET testTarget PROPERTY INTERFACE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-endif()
-
-install(TARGETS testTarget EXPORT testTargets
-  DESTINATION lib
-)
-
-install(EXPORT testTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt
deleted file mode 100644
index d00491f..0000000
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt b/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
deleted file mode 100644
index 6a123f7..0000000
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CMake Error in CMakeLists.txt:
-  Target "testTarget" INTERFACE_SOURCES property contains path:
-
-    ".*Tests/RunCMake/build-property-paths_SOURCES/prefix/src/empty.cpp"
-
-  which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/empty.cpp b/Tests/RunCMake/build-property-paths/empty.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt
rename to Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt
similarity index 61%
rename from Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt
index 94c46ab..f0adc9f 100644
--- a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/build-property-paths_INCLUDE_DIRECTORIES/BinaryDirectoryInInterface-build/foo"
+    ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-OLD-result.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-OLD-result.txt
rename to Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-result.txt
diff --git a/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-result.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-result.txt
rename to Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-result.txt
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt
similarity index 63%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt
index 6473efe..054bff5 100644
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
+      ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-WARN-build/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix"
+      ".*Tests/RunCMake/include_directories/prefix"
 
   however it is also a subdirectory of the build tree:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-WARN-build"
+      ".*Tests/RunCMake/include_directories/prefix/BinInInstallPrefix-CMP0052-WARN-build"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-result.txt b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-result.txt
rename to Tests/RunCMake/include_directories/BinaryDirectoryInInterface-result.txt
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt
similarity index 62%
rename from Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt
index 83ae34c..0d4379e 100644
--- a/Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/InstallInBinDir-build/foo"
+    ".*RunCMake/include_directories/BinaryDirectoryInInterface-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
similarity index 71%
copy from Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
copy to Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
index 8d777f5..67ee7de 100644
--- a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
+++ b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
@@ -2,7 +2,7 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
+target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/foo")
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/build-property-paths/DirInInstallPrefix-result.txt b/Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/DirInInstallPrefix-result.txt
rename to Tests/RunCMake/include_directories/DirInInstallPrefix-result.txt
diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt b/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
similarity index 71%
copy from Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
copy to Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
index 8d777f5..fab7717 100644
--- a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
+++ b/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
@@ -1,8 +1,6 @@
-
 enable_language(CXX)
-
-add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
+add_library(testTarget empty.cpp)
+target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/dir")
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/build-property-paths/InstallInBinDir-result.txt b/Tests/RunCMake/include_directories/InstallInBinDir-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallInBinDir-result.txt
rename to Tests/RunCMake/include_directories/InstallInBinDir-result.txt
diff --git a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
similarity index 57%
rename from Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
index 8db7283..254fae1 100644
--- a/Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/InstallInBinDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/BinInInstallPrefix-CMP0052-NEW-build/foo"
+    ".*Tests/RunCMake/include_directories/InstallInBinDir-build/foo"
 
   which is prefixed in the build directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-result.txt b/Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallInSrcDir-result.txt
rename to Tests/RunCMake/include_directories/InstallInSrcDir-result.txt
diff --git a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
similarity index 67%
rename from Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
index a7a5af4..7be3044 100644
--- a/Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/InstallInSrcDir-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/copy/foo"
+    ".*Tests/RunCMake/include_directories/copy/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface-result.txt b/Tests/RunCMake/include_directories/InstallPrefixInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallPrefixInInterface-result.txt
rename to Tests/RunCMake/include_directories/InstallPrefixInInterface-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt b/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
similarity index 100%
copy from Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
copy to Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
diff --git a/Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirInSource-result.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirInSource-result.txt
rename to Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirOutOfSource-result.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/InstallToPrefixInSrcDirOutOfSource-result.txt
rename to Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-result.txt
diff --git a/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex-result.txt b/Tests/RunCMake/include_directories/RelativePathInGenex-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInGenex-result.txt
rename to Tests/RunCMake/include_directories/RelativePathInGenex-result.txt
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/RelativePathInGenex-stderr.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/RelativePathInGenex-stderr.txt
diff --git a/Tests/RunCMake/include_directories/RelativePathInGenex.cmake b/Tests/RunCMake/include_directories/RelativePathInGenex.cmake
new file mode 100644
index 0000000..070a381
--- /dev/null
+++ b/Tests/RunCMake/include_directories/RelativePathInGenex.cmake
@@ -0,0 +1,8 @@
+
+enable_language(CXX)
+
+add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
+set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
+
+add_library(userTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
+target_link_libraries(userTarget testTarget)
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface-result.txt b/Tests/RunCMake/include_directories/RelativePathInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInInterface-result.txt
rename to Tests/RunCMake/include_directories/RelativePathInInterface-result.txt
diff --git a/Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/RelativePathInInterface-stderr.txt
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/RelativePathInInterface.cmake
similarity index 72%
copy from Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
copy to Tests/RunCMake/include_directories/RelativePathInInterface.cmake
index 8d777f5..4c4727d 100644
--- a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
+++ b/Tests/RunCMake/include_directories/RelativePathInInterface.cmake
@@ -2,7 +2,7 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
+set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/include_directories/RunCMakeTest.cmake b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
index 3f624f8..fa76f24 100644
--- a/Tests/RunCMake/include_directories/RunCMakeTest.cmake
+++ b/Tests/RunCMake/include_directories/RunCMakeTest.cmake
@@ -3,7 +3,148 @@ include(RunCMake)
 run_cmake(NotFoundContent)
 run_cmake(DebugIncludes)
 run_cmake(TID-bad-target)
+run_cmake(SourceDirectoryInInterface)
+run_cmake(BinaryDirectoryInInterface)
+run_cmake(RelativePathInInterface)
 run_cmake(ImportedTarget)
+run_cmake(RelativePathInGenex)
 run_cmake(CMP0021)
 run_cmake(install_config)
 run_cmake(incomplete-genex)
+run_cmake(export-NOWARN)
+
+set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/DirInInstallPrefix/prefix")
+run_cmake(DirInInstallPrefix)
+
+configure_file(
+  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
+  "${RunCMake_BINARY_DIR}/copy/CMakeLists.txt"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/empty.cpp"
+  "${RunCMake_BINARY_DIR}/copy/empty.cpp"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
+  "${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
+  COPYONLY
+)
+set(RunCMake_TEST_OPTIONS
+  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface/prefix"
+  "-DTEST_FILE=${RunCMake_BINARY_DIR}/copy/SourceDirectoryInInterface.cmake"
+  )
+set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/copy")
+run_cmake(InstallInSrcDir)
+unset(RunCMake_TEST_SOURCE_DIR)
+
+set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix")
+set(RunCMake_TEST_OPTIONS
+  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallInBinDir-build/prefix"
+  "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
+  )
+set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/InstallInBinDir-build")
+run_cmake(InstallInBinDir)
+unset(RunCMake_TEST_BINARY_DIR)
+
+configure_file(
+  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
+  "${RunCMake_BINARY_DIR}/prefix/src/CMakeLists.txt"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/empty.cpp"
+  "${RunCMake_BINARY_DIR}/prefix/src/empty.cpp"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/SourceDirectoryInInterface.cmake"
+  "${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
+  COPYONLY
+)
+
+foreach(policyStatus "" NEW OLD)
+  if (NOT "${policyStatus}" STREQUAL "")
+    set(policyOption -DCMAKE_POLICY_DEFAULT_CMP0052=${policyStatus})
+  else()
+    unset(policyOption)
+    set(policyStatus WARN)
+  endif()
+  set(RunCMake_TEST_OPTIONS
+    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
+    "-DTEST_FILE=${RunCMake_SOURCE_DIR}/BinaryDirectoryInInterface.cmake"
+    )
+  # Set the RunCMake_TEST_SOURCE_DIR here to the copy too. This is needed to run
+  # the test suite in-source properly.  Otherwise the install directory would be
+  # a subdirectory or the source directory, which is allowed and tested separately
+  # below.
+  set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/prefix/src")
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/prefix/BinInInstallPrefix-CMP0052-${policyStatus}-build")
+  run_cmake(BinInInstallPrefix-CMP0052-${policyStatus})
+  unset(RunCMake_TEST_BINARY_DIR)
+
+  set(RunCMake_TEST_OPTIONS
+    "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/prefix" ${policyOption}
+    "-DTEST_FILE=${RunCMake_BINARY_DIR}/prefix/src/SourceDirectoryInInterface.cmake"
+    )
+  run_cmake(SrcInInstallPrefix-CMP0052-${policyStatus})
+  unset(RunCMake_TEST_SOURCE_DIR)
+endforeach()
+
+set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/InstallPrefixInInterface-build/prefix")
+run_cmake(InstallPrefixInInterface)
+
+configure_file(
+  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
+  "${RunCMake_BINARY_DIR}/installToSrc/CMakeLists.txt"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/empty.cpp"
+  "${RunCMake_BINARY_DIR}/installToSrc/empty.cpp"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
+  "${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
+  COPYONLY
+)
+set(RunCMake_TEST_OPTIONS
+  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface/prefix"
+  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrc/InstallPrefixInInterface.cmake"
+  )
+set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrc")
+run_cmake(InstallToPrefixInSrcDirOutOfSource)
+unset(RunCMake_TEST_SOURCE_DIR)
+
+
+file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}/installToSrcInSrc")
+set(RunCMake_TEST_NO_CLEAN ON)
+
+configure_file(
+  "${RunCMake_SOURCE_DIR}/CMakeLists.txt"
+  "${RunCMake_BINARY_DIR}/installToSrcInSrc/CMakeLists.txt"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/empty.cpp"
+  "${RunCMake_BINARY_DIR}/installToSrcInSrc/empty.cpp"
+  COPYONLY
+)
+configure_file(
+  "${RunCMake_SOURCE_DIR}/InstallPrefixInInterface.cmake"
+  "${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
+  COPYONLY
+)
+
+set(RunCMake_TEST_OPTIONS
+  "-DCMAKE_INSTALL_PREFIX=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface/prefix"
+  "-DTEST_FILE=${RunCMake_BINARY_DIR}/installToSrcInSrc/InstallPrefixInInterface.cmake"
+  )
+set(RunCMake_TEST_SOURCE_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
+set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/installToSrcInSrc")
+run_cmake(InstallToPrefixInSrcDirInSource)
+unset(RunCMake_TEST_SOURCE_DIR)
+unset(RunCMake_TEST_BINARY_DIR)
+unset(RunCMake_TEST_NO_CLEAN)
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-result.txt b/Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-result.txt
rename to Tests/RunCMake/include_directories/SourceDirectoryInInterface-result.txt
diff --git a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt
similarity index 78%
rename from Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt
index f42a2c2..9346b99 100644
--- a/Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/SourceDirectoryInInterface-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*RunCMake/build-property-paths/foo"
+    ".*RunCMake/include_directories/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
similarity index 71%
rename from Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
rename to Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
index 8d777f5..f814a3c 100644
--- a/Tests/RunCMake/build-property-paths/InstallPrefixInInterface.cmake
+++ b/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
@@ -2,7 +2,7 @@
 enable_language(CXX)
 
 add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
-target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
+target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/foo")
 
 install(TARGETS testTarget EXPORT testTargets
   DESTINATION lib
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-result.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-result.txt
rename to Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
similarity index 66%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
index 2af50d5..afa43e0 100644
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt
@@ -1,6 +1,6 @@
 CMake Error in CMakeLists.txt:
   Target "testTarget" INTERFACE_INCLUDE_DIRECTORIES property contains path:
 
-    ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src/foo"
+    ".*Tests/RunCMake/include_directories/prefix/src/foo"
 
   which is prefixed in the source directory.
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-OLD-result.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-OLD-result.txt
rename to Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-result.txt
diff --git a/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-result.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-result.txt
rename to Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-result.txt
diff --git a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
similarity index 69%
rename from Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
rename to Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
index 56aaa2c..0b13fd8 100644
--- a/Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt
+++ b/Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt
@@ -6,15 +6,15 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Directory:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src/foo"
+      ".*Tests/RunCMake/include_directories/prefix/src/foo"
 
   in INTERFACE_INCLUDE_DIRECTORIES of target "testTarget" is a subdirectory
   of the install directory:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix"
+      ".*Tests/RunCMake/include_directories/prefix"
 
   however it is also a subdirectory of the source tree:
 
-      ".*Tests/RunCMake/build-property-paths_INCLUDE_DIRECTORIES/prefix/src"
+      ".*Tests/RunCMake/include_directories/prefix/src"
 
 This warning is for project developers.  Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/build-property-paths/export-NOWARN-result.txt b/Tests/RunCMake/include_directories/export-NOWARN-result.txt
similarity index 100%
rename from Tests/RunCMake/build-property-paths/export-NOWARN-result.txt
rename to Tests/RunCMake/include_directories/export-NOWARN-result.txt
diff --git a/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt b/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/build-property-paths/export-NOWARN.cmake b/Tests/RunCMake/include_directories/export-NOWARN.cmake
similarity index 71%
rename from Tests/RunCMake/build-property-paths/export-NOWARN.cmake
rename to Tests/RunCMake/include_directories/export-NOWARN.cmake
index 592572c..50720a0 100644
--- a/Tests/RunCMake/build-property-paths/export-NOWARN.cmake
+++ b/Tests/RunCMake/include_directories/export-NOWARN.cmake
@@ -1,34 +1,19 @@
 enable_language(CXX)
 add_library(foo empty.cpp)
-
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<0:>/include/subdir)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_PREFIX>/include/subdir)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<0:>/include/subdir/empty.cpp)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/subdir>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include/$<0:>>)
 set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:$<0:>/include>)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/subdir/empty.cpp>)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
-set_property(TARGET foo APPEND PROPERTY INTERFACE_SOURCES $<INSTALL_INTERFACE:$<0:>/include/subdir/empty.cpp>)
 
 # target_include_directories(foo INTERFACE include/subdir) # Does and should warn. INSTALL_INTERFACE must not list src dir paths.
 target_include_directories(foo INTERFACE $<0:>/include/subdir) # Does not and should not should warn, because it starts with a genex.
 target_include_directories(foo INTERFACE $<INSTALL_PREFIX>/include/subdir)
-target_sources(foo INTERFACE $<0:>/include/subdir/empty.cpp)
-target_sources(foo INTERFACE $<INSTALL_PREFIX>/include/subdir/empty.cpp)
 
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/subdir>)
 target_include_directories(foo INTERFACE $<INSTALL_INTERFACE:include/$<0:>>)
-target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp>)
-target_sources(foo INTERFACE $<INSTALL_INTERFACE:include/subdir/empty.cpp$<0:>>)
-
-install(FILES include/subdir/empty.cpp
-  DESTINATION include/subdir
-)
 
 install(TARGETS foo EXPORT FooTargets DESTINATION lib)
 install(EXPORT FooTargets DESTINATION lib/cmake)
diff --git a/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt b/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt b/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/interface_library/genex_link-stderr.txt b/Tests/RunCMake/interface_library/genex_link-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/interface_library/genex_link-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/message/nomessage-stderr.txt b/Tests/RunCMake/message/nomessage-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/message/nomessage-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt b/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/project/CMP0048-NEW-stderr.txt b/Tests/RunCMake/project/CMP0048-NEW-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/project/CMP0048-NEW-stderr.txt
@@ -0,0 +1 @@
+^$

-----------------------------------------------------------------------

Summary of changes:
 Help/command/target_sources.rst                    |    4 +
 Help/prop_tgt/INTERFACE_SOURCES.rst                |    4 +
 Help/release/dev/export-interface-source-files.rst |    6 -
 Source/cmExportBuildFileGenerator.cxx              |   13 +-
 Source/cmExportFileGenerator.cxx                   |  136 ++++++-----------
 Source/cmExportFileGenerator.h                     |    5 -
 Source/cmExportInstallFileGenerator.cxx            |   28 ++--
 Tests/ExportImport/Export/Interface/CMakeLists.txt |   12 +-
 .../Export/Interface/source_target.cpp             |   13 --
 .../Export/Interface/source_target_for_install.cpp |   13 --
 Tests/ExportImport/Import/Interface/CMakeLists.txt |    8 -
 .../Import/Interface/source_target_test.cpp        |    7 -
 .../RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt |    1 +
 .../CMP0022/CMP0022-NOWARN-shared-stderr.txt       |    1 +
 .../CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt   |    1 +
 ...CMP0022-NOWARN-static-link_libraries-stderr.txt |    1 +
 .../CMP0022/CMP0022-NOWARN-static-stderr.txt       |    1 +
 .../RunCMake/CMP0022/CMP0022-export-exe-stderr.txt |    1 +
 .../CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt |    1 +
 Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt |    1 +
 .../CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt |    1 +
 .../RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt  |    1 +
 Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt      |    1 +
 .../CMP0037/CMP0037-OLD-reserved-stderr.txt        |    1 +
 .../RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt  |    1 +
 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt      |    1 +
 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt      |    1 +
 .../CMP0040/CMP0040-NEW-existing-target-stderr.txt |    1 +
 .../CMP0040/CMP0040-OLD-existing-target-stderr.txt |    1 +
 .../CMP0040/CMP0040-OLD-missing-target-stderr.txt  |    1 +
 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt      |    1 +
 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt  |    1 +
 Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt      |    1 +
 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt      |    1 +
 Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt      |    1 +
 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt      |    1 +
 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt      |    1 +
 .../CMP0046-NEW-existing-dependency-stderr.txt     |    1 +
 .../CMP0046-OLD-existing-dependency-stderr.txt     |    1 +
 .../CMP0046-OLD-missing-dependency-stderr.txt      |    1 +
 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt      |    1 +
 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt      |    1 +
 .../CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt    |    1 +
 .../CMP0055-OLD-Reject-Arguments-stderr.txt        |    1 +
 Tests/RunCMake/CMakeLists.txt                      |   23 +--
 ...LinkImplementationFeatureCycleSolved-stderr.txt |    1 +
 .../DisallowedCommands/CMP0029-OLD-stderr.txt      |    1 +
 .../File_Generate/CarryPermissions-stderr.txt      |    1 +
 .../File_Generate/GenerateSource-stderr.txt        |    1 +
 .../OutputNameMatchesOtherSources-stderr.txt       |    1 +
 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt |    1 +
 .../File_Generate/WriteIfDifferent-stderr.txt      |    1 +
 .../ValidTarget-TARGET_PDB_FILE-stderr.txt         |    1 +
 Tests/RunCMake/RunCMake.cmake                      |    5 +-
 Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt     |    1 +
 .../LinkImplementationCycle3-stderr.txt            |    1 +
 .../TargetSources/CMP0026-LOCATION-stderr.txt      |    1 +
 .../RunCMake/TargetSources/ExportBuild-result.txt  |    2 +-
 .../RunCMake/TargetSources/ExportBuild-stderr.txt  |    1 +
 .../ExportInstall-result.txt}                      |    0
 .../TargetSources/ExportInstall-stderr.txt         |    1 +
 Tests/RunCMake/TargetSources/ExportInstall.cmake   |    6 +
 Tests/RunCMake/TargetSources/RunCMakeTest.cmake    |    1 +
 .../BinInInstallPrefix-CMP0052-NEW-result.txt      |    1 -
 .../BinInInstallPrefix-result.txt                  |    1 -
 .../BinInInstallPrefix-stderr_SOURCES.txt          |    6 -
 .../BinaryDirectoryInInterface-result.txt          |    1 -
 .../BinaryDirectoryInInterface-stderr_SOURCES.txt  |    6 -
 .../BinaryDirectoryInInterface.cmake               |   15 --
 Tests/RunCMake/build-property-paths/CMakeLists.txt |    6 -
 .../build-property-paths/DirInInstallPrefix.cmake  |   14 --
 .../InstallInBinDir-result.txt                     |    1 -
 .../InstallInBinDir-stderr_SOURCES.txt             |    6 -
 .../InstallInSrcDir-result.txt                     |    1 -
 .../InstallInSrcDir-stderr_SOURCES.txt             |    6 -
 .../RelativePathInGenex-result.txt                 |    1 -
 .../RelativePathInGenex-stderr_SOURCES.txt         |    4 -
 .../build-property-paths/RelativePathInGenex.cmake |   13 --
 .../RelativePathInInterface-result.txt             |    1 -
 .../RelativePathInInterface-stderr_SOURCES.txt     |    4 -
 .../RelativePathInInterface.cmake                  |   14 --
 .../build-property-paths/RunCMakeTest.cmake        |  155 --------------------
 .../SourceDirectoryInInterface-result.txt          |    1 -
 .../SourceDirectoryInInterface-stderr_SOURCES.txt  |    6 -
 .../SourceDirectoryInInterface.cmake               |   15 --
 .../SrcInInstallPrefix-CMP0052-NEW-result.txt      |    1 -
 .../SrcInInstallPrefix-result.txt                  |    1 -
 .../SrcInInstallPrefix-stderr_SOURCES.txt          |    6 -
 .../BinInInstallPrefix-CMP0052-NEW-result.txt}     |    0
 .../BinInInstallPrefix-CMP0052-NEW-stderr.txt}     |    2 +-
 .../BinInInstallPrefix-CMP0052-OLD-result.txt      |    0
 .../BinInInstallPrefix-CMP0052-OLD-stderr.txt      |    1 +
 .../BinInInstallPrefix-CMP0052-WARN-result.txt     |    0
 .../BinInInstallPrefix-CMP0052-WARN-stderr.txt}    |    6 +-
 .../BinaryDirectoryInInterface-result.txt}         |    0
 .../BinaryDirectoryInInterface-stderr.txt}         |    2 +-
 .../BinaryDirectoryInInterface.cmake}              |    2 +-
 .../DirInInstallPrefix-result.txt                  |    0
 .../DirInInstallPrefix-stderr.txt                  |    1 +
 .../DirInInstallPrefix.cmake}                      |    6 +-
 .../InstallInBinDir-result.txt}                    |    0
 .../InstallInBinDir-stderr.txt}                    |    2 +-
 .../InstallInSrcDir-result.txt}                    |    0
 .../InstallInSrcDir-stderr.txt}                    |    2 +-
 .../InstallPrefixInInterface-result.txt            |    0
 .../InstallPrefixInInterface-stderr.txt            |    1 +
 .../InstallPrefixInInterface.cmake                 |    0
 .../InstallToPrefixInSrcDirInSource-result.txt     |    0
 .../InstallToPrefixInSrcDirInSource-stderr.txt     |    1 +
 .../InstallToPrefixInSrcDirOutOfSource-result.txt  |    0
 .../InstallToPrefixInSrcDirOutOfSource-stderr.txt  |    1 +
 .../RelativePathInGenex-result.txt}                |    0
 .../RelativePathInGenex-stderr.txt}                |    0
 .../include_directories/RelativePathInGenex.cmake  |    8 +
 .../RelativePathInInterface-result.txt}            |    0
 .../RelativePathInInterface-stderr.txt}            |    0
 .../RelativePathInInterface.cmake}                 |    2 +-
 .../include_directories/RunCMakeTest.cmake         |  141 ++++++++++++++++++
 .../SourceDirectoryInInterface-result.txt}         |    0
 .../SourceDirectoryInInterface-stderr.txt}         |    2 +-
 .../SourceDirectoryInInterface.cmake}              |    2 +-
 .../SrcInInstallPrefix-CMP0052-NEW-result.txt}     |    0
 .../SrcInInstallPrefix-CMP0052-NEW-stderr.txt}     |    2 +-
 .../SrcInInstallPrefix-CMP0052-OLD-result.txt      |    0
 .../SrcInInstallPrefix-CMP0052-OLD-stderr.txt      |    1 +
 .../SrcInInstallPrefix-CMP0052-WARN-result.txt     |    0
 .../SrcInInstallPrefix-CMP0052-WARN-stderr.txt}    |    6 +-
 .../export-NOWARN-result.txt                       |    0
 .../include_directories/export-NOWARN-stderr.txt   |    1 +
 .../export-NOWARN.cmake                            |   15 --
 .../install/SkipInstallRulesNoWarning1-stderr.txt  |    1 +
 .../install/SkipInstallRulesNoWarning2-stderr.txt  |    1 +
 .../interface_library/genex_link-stderr.txt        |    1 +
 .../interface_library/no_shared_libs-stderr.txt    |    1 +
 Tests/RunCMake/message/nomessage-stderr.txt        |    1 +
 .../with_install_prefix-stderr.txt                 |    1 +
 Tests/RunCMake/project/CMP0048-NEW-stderr.txt      |    1 +
 137 files changed, 311 insertions(+), 520 deletions(-)
 delete mode 100644 Help/release/dev/export-interface-source-files.rst
 delete mode 100644 Tests/ExportImport/Export/Interface/source_target.cpp
 delete mode 100644 Tests/ExportImport/Export/Interface/source_target_for_install.cpp
 delete mode 100644 Tests/ExportImport/Import/Interface/source_target_test.cpp
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-exe-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-shared-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-NEW-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-NOWARN-static-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0022/CMP0022-export-exe-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0026/CMP0026-CONFIG-LOCATION-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0026/CMP0026-IMPORTED-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0026/CMP0026-LOCATION-CONFIG-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0028/CMP0028-OLD-iface-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0028/CMP0028-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0040/CMP0040-NEW-existing-target-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0042/CMP0042-NEW-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0043/CMP0043-NEW-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0046/CMP0046-NEW-existing-dependency-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Out-of-Scope-stderr.txt
 create mode 100644 Tests/RunCMake/CMP0055/CMP0055-OLD-Reject-Arguments-stderr.txt
 create mode 100644 Tests/RunCMake/CompileFeatures/LinkImplementationFeatureCycleSolved-stderr.txt
 create mode 100644 Tests/RunCMake/DisallowedCommands/CMP0029-OLD-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/CarryPermissions-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/OutputNameMatchesOtherSources-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/ReRunCMake-stderr.txt
 create mode 100644 Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE-stderr.txt
 create mode 100644 Tests/RunCMake/Syntax/ParenNoSpace2-stderr.txt
 create mode 100644 Tests/RunCMake/TargetPropertyGeneratorExpressions/LinkImplementationCycle3-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/CMP0026-LOCATION-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/ExportBuild-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => TargetSources/ExportInstall-result.txt} (100%)
 create mode 100644 Tests/RunCMake/TargetSources/ExportInstall-stderr.txt
 create mode 100644 Tests/RunCMake/TargetSources/ExportInstall.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/BinInInstallPrefix-CMP0052-NEW-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/BinInInstallPrefix-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/BinInInstallPrefix-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/BinaryDirectoryInInterface.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/DirInInstallPrefix.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/InstallInBinDir-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/InstallInBinDir-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/InstallInSrcDir-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/InstallInSrcDir-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInGenex-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInGenex-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInGenex.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInInterface-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInInterface-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/RelativePathInInterface.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/RunCMakeTest.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/SourceDirectoryInInterface-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/SourceDirectoryInInterface.cmake
 delete mode 100644 Tests/RunCMake/build-property-paths/SrcInInstallPrefix-CMP0052-NEW-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/SrcInInstallPrefix-result.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/SrcInInstallPrefix-stderr_SOURCES.txt
 delete mode 100644 Tests/RunCMake/build-property-paths/empty.cpp
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/BinInInstallPrefix-CMP0052-NEW-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/BinaryDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt => include_directories/BinInInstallPrefix-CMP0052-NEW-stderr.txt} (61%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/BinInInstallPrefix-CMP0052-OLD-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/BinInInstallPrefix-CMP0052-OLD-stderr.txt
 rename Tests/RunCMake/{build-property-paths => include_directories}/BinInInstallPrefix-CMP0052-WARN-result.txt (100%)
 rename Tests/RunCMake/{build-property-paths/BinInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt => include_directories/BinInInstallPrefix-CMP0052-WARN-stderr.txt} (63%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/BinaryDirectoryInInterface-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/InstallInBinDir-stderr_INCLUDE_DIRECTORIES.txt => include_directories/BinaryDirectoryInInterface-stderr.txt} (62%)
 copy Tests/RunCMake/{build-property-paths/InstallPrefixInInterface.cmake => include_directories/BinaryDirectoryInInterface.cmake} (71%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/DirInInstallPrefix-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/DirInInstallPrefix-stderr.txt
 copy Tests/RunCMake/{build-property-paths/InstallPrefixInInterface.cmake => include_directories/DirInInstallPrefix.cmake} (71%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/InstallInBinDir-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/BinInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt => include_directories/InstallInBinDir-stderr.txt} (57%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/InstallInSrcDir-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/InstallInSrcDir-stderr_INCLUDE_DIRECTORIES.txt => include_directories/InstallInSrcDir-stderr.txt} (67%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/InstallPrefixInInterface-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/InstallPrefixInInterface-stderr.txt
 copy Tests/RunCMake/{build-property-paths => include_directories}/InstallPrefixInInterface.cmake (100%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/InstallToPrefixInSrcDirInSource-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInSrcDirInSource-stderr.txt
 rename Tests/RunCMake/{build-property-paths => include_directories}/InstallToPrefixInSrcDirOutOfSource-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/InstallToPrefixInSrcDirOutOfSource-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/RelativePathInGenex-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/RelativePathInGenex-stderr_INCLUDE_DIRECTORIES.txt => include_directories/RelativePathInGenex-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/include_directories/RelativePathInGenex.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/RelativePathInInterface-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/RelativePathInInterface-stderr_INCLUDE_DIRECTORIES.txt => include_directories/RelativePathInInterface-stderr.txt} (100%)
 copy Tests/RunCMake/{build-property-paths/InstallPrefixInInterface.cmake => include_directories/RelativePathInInterface.cmake} (72%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/SourceDirectoryInInterface-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/SourceDirectoryInInterface-stderr_INCLUDE_DIRECTORIES.txt => include_directories/SourceDirectoryInInterface-stderr.txt} (78%)
 rename Tests/RunCMake/{build-property-paths/InstallPrefixInInterface.cmake => include_directories/SourceDirectoryInInterface.cmake} (71%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => include_directories/SrcInInstallPrefix-CMP0052-NEW-result.txt} (100%)
 rename Tests/RunCMake/{build-property-paths/SrcInInstallPrefix-CMP0052-NEW-stderr_INCLUDE_DIRECTORIES.txt => include_directories/SrcInInstallPrefix-CMP0052-NEW-stderr.txt} (66%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/SrcInInstallPrefix-CMP0052-OLD-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/SrcInInstallPrefix-CMP0052-OLD-stderr.txt
 rename Tests/RunCMake/{build-property-paths => include_directories}/SrcInInstallPrefix-CMP0052-WARN-result.txt (100%)
 rename Tests/RunCMake/{build-property-paths/SrcInInstallPrefix-CMP0052-WARN-stderr_INCLUDE_DIRECTORIES.txt => include_directories/SrcInInstallPrefix-CMP0052-WARN-stderr.txt} (69%)
 rename Tests/RunCMake/{build-property-paths => include_directories}/export-NOWARN-result.txt (100%)
 create mode 100644 Tests/RunCMake/include_directories/export-NOWARN-stderr.txt
 rename Tests/RunCMake/{build-property-paths => include_directories}/export-NOWARN.cmake (71%)
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning1-stderr.txt
 create mode 100644 Tests/RunCMake/install/SkipInstallRulesNoWarning2-stderr.txt
 create mode 100644 Tests/RunCMake/interface_library/genex_link-stderr.txt
 create mode 100644 Tests/RunCMake/interface_library/no_shared_libs-stderr.txt
 create mode 100644 Tests/RunCMake/message/nomessage-stderr.txt
 create mode 100644 Tests/RunCMake/no_install_prefix/with_install_prefix-stderr.txt
 create mode 100644 Tests/RunCMake/project/CMP0048-NEW-stderr.txt


hooks/post-receive
-- 
CMake