[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-618-g7c38530

[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  7c38530a4c135de6a7c4eb50d948cdb68f5a8a54 (commit)
       via  ee36c9f18f785ebbd3653010315fae8722d4aab1 (commit)
      from  672069cdff86598e620b1555b2fe3778d9d9ea53 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c38530a4c135de6a7c4eb50d948cdb68f5a8a54
commit 7c38530a4c135de6a7c4eb50d948cdb68f5a8a54
Merge: 672069c ee36c9f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 06:44:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 17 06:44:25 2015 -0400

    Merge topic 'use-generator-target' into next
    
    ee36c9f1 fixup! cmLocalGenerator: Port some API to cmGeneratorTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee36c9f18f785ebbd3653010315fae8722d4aab1
commit ee36c9f18f785ebbd3653010315fae8722d4aab1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 17 12:44:13 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 17 12:44:13 2015 +0200

    fixup! cmLocalGenerator: Port some API to cmGeneratorTarget.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 8454bc1..d4ccde6 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1814,14 +1814,14 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->CurrentLocalGenerator->AddLanguageFlags(flags, lang, configName);
 
     // Add shared-library flags if needed.
-    this->CurrentLocalGenerator->AddCMP0018Flags(flags, &target,
+    this->CurrentLocalGenerator->AddCMP0018Flags(flags, gtgt,
                                                  lang, configName);
 
-    this->CurrentLocalGenerator->AddVisibilityPresetFlags(flags, &target,
+    this->CurrentLocalGenerator->AddVisibilityPresetFlags(flags, gtgt,
                                                    lang);
 
     this->CurrentLocalGenerator->
-      AddCompileOptions(flags, &target, lang, configName);
+      AddCompileOptions(flags, gtgt, lang, configName);
     }
 
   std::string llang = gtgt->GetLinkerLanguage(configName);
@@ -1884,7 +1884,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
     this->CurrentLocalGenerator
       ->GetStaticLibraryFlags(extraLinkOptions,
                               cmSystemTools::UpperCase(configName),
-                              &target);
+                              gtgt);
     }
   else
     {

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake