[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2349-gd10c2ca

[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  d10c2caa7c63c4e0de98e4072f58b30fa4969219 (commit)
       via  10d7bf4e620c04b90a22a954ca0d6948fd9d2842 (commit)
      from  64942b81eae8888527d6f751eb80b066d15cbe06 (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=d10c2caa7c63c4e0de98e4072f58b30fa4969219
commit d10c2caa7c63c4e0de98e4072f58b30fa4969219
Merge: 64942b8 10d7bf4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 26 16:56:50 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 26 16:56:50 2013 -0500

    Merge topic 'xcode-COMBINE_HIDPI_IMAGES' into next
    
    10d7bf4 Xcode: Generate recommended artwork setting (#13954)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10d7bf4e620c04b90a22a954ca0d6948fd9d2842
commit 10d7bf4e620c04b90a22a954ca0d6948fd9d2842
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 26 11:36:22 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 26 12:54:01 2013 -0500

    Xcode: Generate recommended artwork setting (#13954)
    
    Add the COMBINE_HIDPI_IMAGES = YES setting to all Xcode project targets.
    Otherwise Xcode may ask the user to "Update to recommended settings".

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fbddc53..2222a0e 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2110,6 +2110,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     debugStr = "NO";
     }
 
+  buildSettings->AddAttribute("COMBINE_HIDPI_IMAGES",
+                              this->CreateString("YES"));
   buildSettings->AddAttribute("GCC_GENERATE_DEBUGGING_SYMBOLS",
                               this->CreateString(debugStr));
   buildSettings->AddAttribute("GCC_OPTIMIZATION_LEVEL",

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

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


hooks/post-receive
-- 
CMake