Merge topic 'wix-fix-root-dir-prop'

fb009f00 CPackWiX: Work around RelativePath() returning an empty string for the root

Source/CPack/WiX/cmCPackWIXGenerator.cxx

@@ -850,6 +850,11 @@ void cmCPackWIXGenerator::AddDirectoryAndFileDefinitons(
   std::string relativeDirectoryPath =
     cmSystemTools::RelativePath(toplevel.c_str(), topdir.c_str());
 
+  if(relativeDirectoryPath.empty())
+    {
+    relativeDirectoryPath = ".";
+    }
+
   cmInstalledFile const* directoryInstalledFile =
     this->GetInstalledFile(relativeDirectoryPath);