[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3493-g8867761

[Patrick Gansterer]

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  8867761fd70f7b0cc214561c18d40c47e561525d (commit)
       via  bcfee5c36af63b1580a747f4a14495c54dfea7ed (commit)
       via  9a591ece790856b8accf3eb2c1ed678e6d26dc9c (commit)
      from  56bad1a83acae148ea411ade5fba95baaa7e42d1 (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=8867761fd70f7b0cc214561c18d40c47e561525d
commit 8867761fd70f7b0cc214561c18d40c47e561525d
Merge: 56bad1a bcfee5c
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Tue Jul 30 06:46:15 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 30 06:46:15 2013 -0400

    Merge topic 'static_library_flags' into next
    
    bcfee5c Xcode: Use upper case version of the config when reading the library flags
    9a591ec VS6: Add handling of CMAKE_*_LINKER_FLAGS_<CONFIG> variables


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcfee5c36af63b1580a747f4a14495c54dfea7ed
commit bcfee5c36af63b1580a747f4a14495c54dfea7ed
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Tue Jul 30 12:29:36 2013 +0200
Commit:     Patrick Gansterer <paroga at paroga.com>
CommitDate: Tue Jul 30 12:29:36 2013 +0200

    Xcode: Use upper case version of the config when reading the library flags
    
    Add a missing call to cmSystemTools::UpperCase() to get the upper case
    version of the configuration name needed by GetStaticLibraryFlags().

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 59dfea4..7cb2d1f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1773,7 +1773,9 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
      target.GetType() == cmTarget::STATIC_LIBRARY)
     {
     this->CurrentLocalGenerator
-      ->GetStaticLibraryFlags(extraLinkOptions, configName, &target);
+      ->GetStaticLibraryFlags(extraLinkOptions,
+                              cmSystemTools::UpperCase(configName),
+                              &target);
     }
   else
     {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a591ece790856b8accf3eb2c1ed678e6d26dc9c
commit 9a591ece790856b8accf3eb2c1ed678e6d26dc9c
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Tue Jul 30 12:23:50 2013 +0200
Commit:     Patrick Gansterer <paroga at paroga.com>
CommitDate: Tue Jul 30 12:23:50 2013 +0200

    VS6: Add handling of CMAKE_*_LINKER_FLAGS_<CONFIG> variables
    
    Read the content of the config specific linker flags in the
    Visual Studio 6 generator too.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 5ca8aba..667d86f 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1171,18 +1171,42 @@ void cmLocalVisualStudio6Generator
   std::string extraLinkOptionsRelWithDebInfo;
   if(target.GetType() == cmTarget::EXECUTABLE)
     {
-    extraLinkOptions =
-      this->Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
+    extraLinkOptions = this->Makefile->
+      GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
+    extraLinkOptionsDebug = this->Makefile->
+      GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS_DEBUG");
+    extraLinkOptionsRelease = this->Makefile->
+      GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS_RELEASE");
+    extraLinkOptionsMinSizeRel = this->Makefile->
+      GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS_MINSIZEREL");
+    extraLinkOptionsRelWithDebInfo = this->Makefile->
+      GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO");
     }
   if(target.GetType() == cmTarget::SHARED_LIBRARY)
     {
-    extraLinkOptions =
-      this->Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
+    extraLinkOptions = this->Makefile->
+      GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
+    extraLinkOptionsDebug = this->Makefile->
+      GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS_DEBUG");
+    extraLinkOptionsRelease = this->Makefile->
+      GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS_RELEASE");
+    extraLinkOptionsMinSizeRel = this->Makefile->
+      GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL");
+    extraLinkOptionsRelWithDebInfo = this->Makefile->
+      GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO");
     }
   if(target.GetType() == cmTarget::MODULE_LIBRARY)
     {
-    extraLinkOptions =
-      this->Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
+    extraLinkOptions = this->Makefile->
+      GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
+    extraLinkOptionsDebug = this->Makefile->
+      GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS_DEBUG");
+    extraLinkOptionsRelease = this->Makefile->
+      GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS_RELEASE");
+    extraLinkOptionsMinSizeRel = this->Makefile->
+      GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL");
+    extraLinkOptionsRelWithDebInfo = this->Makefile->
+      GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO");
     }
 
   // Get extra linker options for this target.

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

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


hooks/post-receive
-- 
CMake