[Cmake-commits] CMake branch, next, updated. v3.0.2-5568-g3d5dd7d
Nils Gladitz
nilsgladitz at gmail.com
Fri Oct 3 09:12:24 EDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3d5dd7db1f41269b266f76bf6e01c5490f57b22d (commit)
via fb009f00aeae142b7fbf6bbec78dd1e6ab2f7ae2 (commit)
via 0e0cb710d03006920bef9d8746e0966a6e48e8fb (commit)
from c23378ff426f2597f35eb27b53bc2a99b5a0f069 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d5dd7db1f41269b266f76bf6e01c5490f57b22d
commit 3d5dd7db1f41269b266f76bf6e01c5490f57b22d
Merge: c23378f fb009f0
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Oct 3 09:12:23 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 3 09:12:23 2014 -0400
Merge topic 'wix-fix-root-dir-prop' into next
fb009f00 CPackWiX: Work around RelativePath() returning an empty string for the root
0e0cb710 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb009f00aeae142b7fbf6bbec78dd1e6ab2f7ae2
commit fb009f00aeae142b7fbf6bbec78dd1e6ab2f7ae2
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Oct 3 15:10:51 2014 +0200
Commit: Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Oct 3 15:10:51 2014 +0200
CPackWiX: Work around RelativePath() returning an empty string for the root
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);
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/CPack/WiX/cmCPackWIXGenerator.cxx | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list