[Cmake-commits] CMake branch, next, updated. v2.8.4-1895-gac807d5

[David Cole]

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  ac807d57efd21685bbd75a9211290dda4ff44f65 (commit)
       via  74c73d5fa0af15c8316a4ab7cfe0aed0f39450f1 (commit)
      from  ea8597513336d96f5e806235716fe1158fb1952d (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=ac807d57efd21685bbd75a9211290dda4ff44f65
commit ac807d57efd21685bbd75a9211290dda4ff44f65
Merge: ea85975 74c73d5
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Jul 19 11:47:40 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 19 11:47:40 2011 -0400

    Merge topic 'effective-platform-name' into next
    
    74c73d5 Correct KWStyle line too long error


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=74c73d5fa0af15c8316a4ab7cfe0aed0f39450f1
commit 74c73d5fa0af15c8316a4ab7cfe0aed0f39450f1
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Jul 19 11:33:01 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Jul 19 11:33:01 2011 -0400

    Correct KWStyle line too long error

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 76dd770..b3e2e7a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2403,7 +2403,8 @@ void cmGlobalXCodeGenerator
         {
         if(this->XcodeVersion > 15)
           {
-          // now add the same one but append $(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) to it:
+          // Now add the same one but append
+          // $(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) to it:
           linkDirs += " ";
           linkDirs += this->XCodeEscapePath(
             (*libDir + "/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)").c_str());

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake