[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1419-ga4e06ee

Stephen Kelly steveire at gmail.com
Sat Jan 5 07:34:33 EST 2013


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  a4e06eec06140c0bb4fa6872e3b47b78679c557d (commit)
       via  786aa36afdd5288d03ea46d2ad3820f27a7701e7 (commit)
      from  880090cfc62a55de1e645f23bd5eacf3e0f41eb0 (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=a4e06eec06140c0bb4fa6872e3b47b78679c557d
commit a4e06eec06140c0bb4fa6872e3b47b78679c557d
Merge: 880090c 786aa36
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 5 07:34:32 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 5 07:34:32 2013 -0500

    Merge topic 'LINK_LIBRARIES-property' into next
    
    786aa36 Fix (hopefully) the Mac build.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=786aa36afdd5288d03ea46d2ad3820f27a7701e7
commit 786aa36afdd5288d03ea46d2ad3820f27a7701e7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 5 13:32:47 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jan 5 13:32:47 2013 +0100

    Fix (hopefully) the Mac build.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index b2d325c..4c26b82 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1206,7 +1206,7 @@ void cmGlobalXCodeGenerator::ForceLinkerLanguage(cmTarget& cmtarget)
 
   // If the language is compiled as a source trust Xcode to link with it.
   cmTarget::LinkImplementation const* impl =
-    cmtarget.GetLinkImplementation("NOCONFIG");
+    cmtarget.GetLinkImplementation("NOCONFIG", &cmtarget);
   for(std::vector<std::string>::const_iterator li = impl->Languages.begin();
       li != impl->Languages.end(); ++li)
     {

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list