diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-06 13:41:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-06 13:41:21 (GMT) |
| commit | c74d2ddfa47792326c6d8b74df8816e27ad87e4c (patch) | |
| tree | 6bb708da25ae26edfa2eab880cede0365bfd2fe8 | |
| parent | b1531431dd4914ffd8cd48e7d5b23fe77360dc19 (diff) | |
| parent | fb009f00aeae142b7fbf6bbec78dd1e6ab2f7ae2 (diff) | |
| download | CMake-c74d2ddfa47792326c6d8b74df8816e27ad87e4c.zip CMake-c74d2ddfa47792326c6d8b74df8816e27ad87e4c.tar.gz CMake-c74d2ddfa47792326c6d8b74df8816e27ad87e4c.tar.bz2 | |
Merge topic 'wix-fix-root-dir-prop'
fb009f00 CPackWiX: Work around RelativePath() returning an empty string for the root
| -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); |