[Cmake-commits] CMake branch, master, updated. d96371922d2cad56d14067525c798d9ce3f3e0e9

[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, master has been updated
       via  d96371922d2cad56d14067525c798d9ce3f3e0e9 (commit)
       via  b3843bab6045c38b35fb8a2463fdfdf9fc9d7db3 (commit)
      from  45d9106eefafe3b9158e6890e44be643a0f7ff64 (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=d96371922d2cad56d14067525c798d9ce3f3e0e9
commit d96371922d2cad56d14067525c798d9ce3f3e0e9
Author: Alex Neundorf <neundorf at kde.org>
Date:   Tue Apr 20 22:14:52 2010 +0200

    -fix typo in HAS_CXX docs (#10578)
    
    Alex

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0436bd0..54b1815 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -202,7 +202,7 @@ void cmTarget::DefineProperties(cmake *cm)
 
   cm->DefineProperty
     ("HAS_CXX", cmProperty::TARGET,
-     "Link the target using the C++ linker tool (obselete).",
+     "Link the target using the C++ linker tool (obsolete).",
      "This is equivalent to setting the LINKER_LANGUAGE property to CXX.  "
      "See that property's documentation for details.");
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3843bab6045c38b35fb8a2463fdfdf9fc9d7db3
commit b3843bab6045c38b35fb8a2463fdfdf9fc9d7db3
Author: Alex Neundorf <neundorf at kde.org>
Date:   Mon Apr 19 20:28:29 2010 +0200

    -fix linking to frameworks when crosscompiling from Linux to iPhone (#10526)
    
    Alex

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index d84da52..9236ad5 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1326,13 +1326,14 @@ void cmComputeLinkInformation::AddFrameworkItem(std::string const& item)
 //----------------------------------------------------------------------------
 void cmComputeLinkInformation::AddDirectoryItem(std::string const& item)
 {
-#ifdef __APPLE__
+  std::string systemName =
+                        this->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME");
+  if(systemName == "Darwin" && cmSystemTools::IsPathToFramework(item.c_str()))
   if(cmSystemTools::IsPathToFramework(item.c_str()))
     {
     this->AddFrameworkItem(item);
     }
   else
-#endif
     {
     this->DropDirectoryItem(item);
     }

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

Summary of changes:
 Source/cmComputeLinkInformation.cxx |    5 +++--
 Source/cmTarget.cxx                 |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake