[Cmake-commits] CMake branch, master, updated. 0feb0b2d729f28a152a7bc330c407c223e845d6c

[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  0feb0b2d729f28a152a7bc330c407c223e845d6c (commit)
      from  1da611fd46818a33abf7179e1a82518b2c90421e (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=0feb0b2d729f28a152a7bc330c407c223e845d6c
commit 0feb0b2d729f28a152a7bc330c407c223e845d6c
Author: Alex Neundorf <neundorf at kde.org>
Date:   Tue Apr 27 21:40:17 2010 +0200

    -fix bad check for Apple in AddDirectoryItem() introduced recently
    
    Alex

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 9236ad5..1cabed2 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -1326,10 +1326,8 @@ void cmComputeLinkInformation::AddFrameworkItem(std::string const& item)
 //----------------------------------------------------------------------------
 void cmComputeLinkInformation::AddDirectoryItem(std::string const& item)
 {
-  std::string systemName =
-                        this->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME");
-  if(systemName == "Darwin" && cmSystemTools::IsPathToFramework(item.c_str()))
-  if(cmSystemTools::IsPathToFramework(item.c_str()))
+  if(this->Makefile->IsOn("APPLE")
+     && cmSystemTools::IsPathToFramework(item.c_str()))
     {
     this->AddFrameworkItem(item);
     }

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

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


hooks/post-receive
-- 
CMake