[Cmake-commits] CMake branch, next, updated. v2.8.4-996-g3397e54
Eric Noulard
eric.noulard at gmail.com
Wed Feb 23 18:30:06 EST 2011
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 3397e54c3c77d1b1f713e6066a47154cc8d487d7 (commit)
via f2ab270e6f0f1c95fe134a7b9b1ad4037d0ef0fe (commit)
from 6dbbf23a3973b076870f1f6e97a1dbe81d3fb311 (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=3397e54c3c77d1b1f713e6066a47154cc8d487d7
commit 3397e54c3c77d1b1f713e6066a47154cc8d487d7
Merge: 6dbbf23 f2ab270
Author: Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Wed Feb 23 18:30:04 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 23 18:30:04 2011 -0500
Merge topic 'CPack-ChangeComponentNamingScheme' into next
f2ab270 CPack fix KWStyle warning
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2ab270e6f0f1c95fe134a7b9b1ad4037d0ef0fe
commit f2ab270e6f0f1c95fe134a7b9b1ad4037d0ef0fe
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Thu Feb 24 00:29:25 2011 +0100
Commit: Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Thu Feb 24 00:29:25 2011 +0100
CPack fix KWStyle warning
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 4cb4f36..86200c1 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -1344,7 +1344,7 @@ std::string cmCPackGenerator::GetComponentPackageFileName(
else
{
std::string dispVar = "CPACK_COMPONENT_"
- + cmSystemTools::UpperCase(groupOrComponentName) + "_DISPLAY_NAME";
+ + cmSystemTools::UpperCase(groupOrComponentName) + "_DISPLAY_NAME";
const char* dispName = GetOption(dispVar.c_str());
if(dispName)
{
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cmCPackGenerator.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list