[Cmake-commits] CMake branch, next, updated. v2.8.1-1258-gc81d128

[cmake-commits at cmake.org]

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  c81d128e2a18bd95b1f75b0315cbb6fa4e8e86b6 (commit)
       via  5c49aa0c8622b5253b6041e85ba32a5b5ce26d74 (commit)
      from  be834bac782e0a5967bc76bee6f4b786875645c2 (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=c81d128e2a18bd95b1f75b0315cbb6fa4e8e86b6
commit c81d128e2a18bd95b1f75b0315cbb6fa4e8e86b6
Merge: be834ba 5c49aa0
Author: Brad King <brad.king at kitware.com>
Date:   Fri May 28 13:27:58 2010 -0400

    Merge branch 'per-config-link-flags' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c49aa0c8622b5253b6041e85ba32a5b5ce26d74
commit 5c49aa0c8622b5253b6041e85ba32a5b5ce26d74
Author: Brad King <brad.king at kitware.com>
Date:   Fri May 28 13:23:31 2010 -0400

    Xcode: Archives use STATIC_LIBRARY_FLAGS, not LINK_FLAGS
    
    The LINK_FLAGS property is defined only for targets that really link.
    These include executables and shared libraries.  For static libraries we
    define the STATIC_LIBRARY_FLAGS property.  Teach the Xcode generator to
    make this distinction.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 0d6e389..537a88f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1514,8 +1514,13 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     extraLinkOptions = this->CurrentMakefile->
       GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
     }
-  
-  const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");
+
+  const char* linkFlagsProp = "LINK_FLAGS";
+  if(target.GetType() == cmTarget::STATIC_LIBRARY)
+    {
+    linkFlagsProp = "STATIC_LIBRARY_FLAGS";
+    }
+  const char* targetLinkFlags = target.GetProperty(linkFlagsProp);
   if(targetLinkFlags)
     {
     extraLinkOptions += " ";
@@ -1523,7 +1528,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     }
   if(configName && *configName)
     {
-    std::string linkFlagsVar = "LINK_FLAGS_";
+    std::string linkFlagsVar = linkFlagsProp;
+    linkFlagsVar += "_";
     linkFlagsVar += cmSystemTools::UpperCase(configName);
     if(const char* linkFlags = target.GetProperty(linkFlagsVar.c_str()))
       {

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

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


hooks/post-receive
-- 
CMake