[Cmake-commits] CMake branch, next, updated. v2.8.11-2268-gfcf8945

[Stephen Kelly]

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  fcf8945a22a0790e738a3adf4e385570f437b7c7 (commit)
       via  e897f8d098286068625c7a58fde006c2c47e79fe (commit)
      from  0eec0ae6d47ca4bec4fa631e27cff598db2db621 (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=fcf8945a22a0790e738a3adf4e385570f437b7c7
commit fcf8945a22a0790e738a3adf4e385570f437b7c7
Merge: 0eec0ae e897f8d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 28 12:27:07 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 28 12:27:07 2013 -0400

    Merge topic 'target-COMPILE_OPTIONS' into next
    
    e897f8d Fix build of xcode generator.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e897f8d098286068625c7a58fde006c2c47e79fe
commit e897f8d098286068625c7a58fde006c2c47e79fe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 28 18:26:29 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 28 18:26:29 2013 +0200

    Fix build of xcode generator.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index cd20ae8..10de35a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -680,11 +680,12 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
                                               cmTarget& cmtarget)
 {
   // Add flags from target and source file properties.
+  std::string flags;
   std::string targetFlags;
   lg->GetCompileOptions(targetFlags, &cmtarget, 0); // TODO: Config?
-  if(!targetFlags)
+  if(!targetFlags.empty())
     {
-    lg->AppendFlags(flags, targetFlags);
+    lg->AppendFlags(flags, targetFlags.c_str());
     }
   const char* srcfmt = sf->GetProperty("Fortran_FORMAT");
   switch(this->CurrentLocalGenerator->GetFortranFormat(srcfmt))

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

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


hooks/post-receive
-- 
CMake