kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

fb009f00 CPackWiX: Work around RelativePath() returning an empty string for the root
This commit is contained in:
Brad King 2014-10-06 09:41:21 -04:00 committed by CMake Topic Stage
parent b1531431dd fb009f00ae
commit c74d2ddfa4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CPack/WiX/cmCPackWIXGenerator.cxx
View File

@ -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);