From fb009f00aeae142b7fbf6bbec78dd1e6ab2f7ae2 Mon Sep 17 00:00:00 2001 From: Nils Gladitz Date: Fri, 3 Oct 2014 15:10:51 +0200 Subject: CPackWiX: Work around RelativePath() returning an empty string for the root --- Source/CPack/WiX/cmCPackWIXGenerator.cxx | 5 +++++ 1 file changed, 5 insertions(+) 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); -- cgit v0.12