[Cmake-commits] CMake branch, next, updated. v2.8.2-847-g3b8d74b

[Brad King]

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  3b8d74b9326df8d03163b349d7ccbd4c7cd4aa8c (commit)
       via  a8ded5338bf44173fe33e0249ab14aa3d8e7540c (commit)
       via  0790af3bf54f8b1fcd418fec4ff968ffa55f334c (commit)
      from  8aee0e5f35a82512a10ff59b1f7c2535b4ec7316 (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=3b8d74b9326df8d03163b349d7ccbd4c7cd4aa8c
commit 3b8d74b9326df8d03163b349d7ccbd4c7cd4aa8c
Merge: 8aee0e5 a8ded53
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 20 11:07:42 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 20 11:07:42 2010 -0400

    Merge topic 'xcode-ARCHS-quoting' into next
    
    a8ded53 Xcode: Quote string values containing '$' (#11244)
    0790af3 Xcode: Avoid trailing space in ARCHS list (#11244)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8ded5338bf44173fe33e0249ab14aa3d8e7540c
commit a8ded5338bf44173fe33e0249ab14aa3d8e7540c
Author:     Mikkel Krautz <mikkel at krautz.dk>
AuthorDate: Sat Sep 18 14:18:12 2010 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 20 10:08:40 2010 -0400

    Xcode: Quote string values containing '$' (#11244)
    
    Allow use of $(STANDARD_32BIT_ARCHS) as CMAKE_OSX_ARCHITECTURES.
    The expanded value must remain a single string.

diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 07c7b8c..5920470 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -236,7 +236,7 @@ void cmXCodeObject::PrintString(std::ostream& os) const
   // considered special by the Xcode project file parser.
   bool needQuote =
     (this->String.empty() ||
-     this->String.find_first_of(" <>.+-=@") != this->String.npos);
+     this->String.find_first_of(" <>.+-=@$") != this->String.npos);
   const char* quote = needQuote? "\"" : "";
 
   // Print the string, quoted and escaped as necessary.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0790af3bf54f8b1fcd418fec4ff968ffa55f334c
commit 0790af3bf54f8b1fcd418fec4ff968ffa55f334c
Author:     Mikkel Krautz <mikkel at krautz.dk>
AuthorDate: Mon Sep 20 10:02:39 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 20 10:05:33 2010 -0400

    Xcode: Avoid trailing space in ARCHS list (#11244)
    
    With CMAKE_OSX_ARCHITECTURE settings such as $(ARCHS_STANDARD_32BIT),
    the space inserted by the for loop would confuse Xcode if quoted. In
    this particular example, what would be output would be:
    
      ARCHS = "$(ARCHS_STANDARD_32BIT) ";
    
    The Xcode UI does not recognize this as the built-in "Standards 32-bit"
    architecture setting unless the space is removed.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index c63b403..4e9969d 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2726,12 +2726,14 @@ void cmGlobalXCodeGenerator
     buildSettings->AddAttribute("SDKROOT", 
                                 this->CreateString(sysroot));
     std::string archString;
+    const char* sep = "";
     for( std::vector<std::string>::iterator i = 
            this->Architectures.begin();
          i != this->Architectures.end(); ++i)
       {
+      archString += sep;
       archString += *i;
-      archString += " ";
+      sep = " ";
       }
     buildSettings->AddAttribute("ARCHS", 
                                 this->CreateString(archString.c_str()));

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

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


hooks/post-receive
-- 
CMake