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

[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  d7ceb75e8aa3395285d34dbbefc6c8c0266f7946 (commit)
      from  0b7206dd23f3b8ec7e35fab6dc083ab4fa188b7d (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=d7ceb75e8aa3395285d34dbbefc6c8c0266f7946
commit d7ceb75e8aa3395285d34dbbefc6c8c0266f7946
Author: Alex Neundorf <neundorf at kde.org>
Date:   Mon May 3 21:28:12 2010 +0200

    -fix GetFrameworkFlags() for Mac, which was broken with my last commit
    
    Alex

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 124d2bd..ac727ac 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1445,7 +1445,7 @@ std::string cmMakefileTargetGenerator::GetFrameworkFlags()
  std::set<cmStdString> emitted;
 #ifdef __APPLE__  /* don't insert this when crosscompiling e.g. to iphone */
   emitted.insert("/System/Library/Frameworks");
-#else
+#endif
   std::vector<std::string> includes;
   this->LocalGenerator->GetIncludeDirectories(includes);
   std::vector<std::string>::iterator i;
@@ -1477,7 +1477,6 @@ std::string cmMakefileTargetGenerator::GetFrameworkFlags()
       }
     }
   return flags;
-#endif
 }
 
 //----------------------------------------------------------------------------

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

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


hooks/post-receive
-- 
CMake