[Cmake-commits] CMake branch, next, updated. v2.8.11-2156-g0e30b29

[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  0e30b29ecb0c44deb104e08a8ad2566c85d29eff (commit)
       via  bcda47d2a0673d46ffe209e3e0c07724eb6b8f5a (commit)
      from  bd5860307db4d4e92098e0f531b0bf3a03fa3717 (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=0e30b29ecb0c44deb104e08a8ad2566c85d29eff
commit 0e30b29ecb0c44deb104e08a8ad2566c85d29eff
Merge: bd58603 bcda47d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 22 13:09:28 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 22 13:09:28 2013 -0400

    Merge topic 'xcode-shared-linker-flags-per-config' into next
    
    bcda47d Xcode: Honor CMAKE_(MODULE|SHARED)_LINKER_FLAGS_<CONFIG> (#14161)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcda47d2a0673d46ffe209e3e0c07724eb6b8f5a
commit bcda47d2a0673d46ffe209e3e0c07724eb6b8f5a
Author:     Matthew Bentham <mjb67 at artvps.com>
AuthorDate: Wed May 22 08:44:00 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 22 11:48:01 2013 -0400

    Xcode: Honor CMAKE_(MODULE|SHARED)_LINKER_FLAGS_<CONFIG> (#14161)
    
    Refactor lookup of CMAKE_(EXE|MODULE|SHARED)_LINKER_FLAGS(|_<CONFIG>)
    variables to ensure all combinations are handled.  Use the helper method
    AddConfigVariableFlags to simplify the implementation.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 870bfa1..c739dcb 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1716,30 +1716,26 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
   buildSettings->AddAttribute
     ("GCC_PREPROCESSOR_DEFINITIONS", ppDefs.CreateList());
 
+  std::string extraLinkOptionsVar;
   std::string extraLinkOptions;
   if(target.GetType() == cmTarget::EXECUTABLE)
     {
-    extraLinkOptions =
-      this->CurrentMakefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
-    std::string var = "CMAKE_EXE_LINKER_FLAGS_";
-    var += cmSystemTools::UpperCase(configName);
-    std::string val =
-      this->CurrentMakefile->GetSafeDefinition(var.c_str());
-    if(val.size())
-      {
-      extraLinkOptions += " ";
-      extraLinkOptions += val;
-      }
+    extraLinkOptionsVar = "CMAKE_EXE_LINKER_FLAGS";
     }
-  if(target.GetType() == cmTarget::SHARED_LIBRARY)
+  else if(target.GetType() == cmTarget::SHARED_LIBRARY)
+    {
+    extraLinkOptionsVar = "CMAKE_SHARED_LINKER_FLAGS";
+    }
+  else if(target.GetType() == cmTarget::MODULE_LIBRARY)
     {
-    extraLinkOptions = this->CurrentMakefile->
-      GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
+    extraLinkOptionsVar = "CMAKE_MODULE_LINKER_FLAGS";
     }
-  if(target.GetType() == cmTarget::MODULE_LIBRARY)
+  if(extraLinkOptionsVar.size())
     {
-    extraLinkOptions = this->CurrentMakefile->
-      GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
+    this->CurrentLocalGenerator
+      ->AddConfigVariableFlags(extraLinkOptions,
+                               extraLinkOptionsVar.c_str(),
+                               configName);
     }
 
   const char* linkFlagsProp = "LINK_FLAGS";

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

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


hooks/post-receive
-- 
CMake