diff options
| author | Nils Gladitz <nilsgladitz@gmail.com> | 2014-10-03 13:10:51 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2014-10-03 13:10:51 (GMT) |
| commit | fb009f00aeae142b7fbf6bbec78dd1e6ab2f7ae2 (patch) | |
| tree | feebd647fc2f36f8af5da24e7d71738d85fc344d /Source/CPack | |
| parent | 0e0cb710d03006920bef9d8746e0966a6e48e8fb (diff) | |
| download | CMake-fb009f00aeae142b7fbf6bbec78dd1e6ab2f7ae2.zip CMake-fb009f00aeae142b7fbf6bbec78dd1e6ab2f7ae2.tar.gz CMake-fb009f00aeae142b7fbf6bbec78dd1e6ab2f7ae2.tar.bz2 | |
CPackWiX: Work around RelativePath() returning an empty string for the root
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 744280a..7e00027 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/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); |