[Cmake-commits] CMake branch, master, updated. v2.8.3-583-g833b8aa

[Brad King]

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  833b8aa902f765601ea3209e39bbacf574a77432 (commit)
       via  c83a834d29965e245e1e93fcda0e98e58e775f9f (commit)
      from  7f37eac6dd7f26c33b0c80b99f862ac0f53e6a8e (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=833b8aa902f765601ea3209e39bbacf574a77432
commit 833b8aa902f765601ea3209e39bbacf574a77432
Merge: 7f37eac c83a834
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 26 15:25:18 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 26 15:25:18 2011 -0500

    Merge topic 'recursive-CMAKE_USER_MAKE_RULES_OVERRIDE'
    
    c83a834 try_compile: Allow only languages loaded in caller (#11469)

diff --cc Source/cmGlobalGenerator.h
index 6a1aa53,26690af..5268731
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@@ -321,15 -321,14 +322,17 @@@ protected
    // All targets in the entire project.
    std::map<cmStdString,cmTarget *> TotalTargets;
  
 +  virtual const char* GetPredefinedTargetsFolder();
 +  virtual bool UseFolderProperty();
 +
  private:
+   cmMakefile* TryCompileOuterMakefile;
    float FirstTimeProgress;
    // If you add a new map here, make sure it is copied
 -  // in EnableLanguagesFromGenerator 
 +  // in EnableLanguagesFromGenerator
    std::map<cmStdString, bool> IgnoreExtensions;
    std::map<cmStdString, bool> LanguageEnabled;
+   std::set<cmStdString> LanguagesReady; // Ready for try_compile
    std::map<cmStdString, cmStdString> OutputExtensions;
    std::map<cmStdString, cmStdString> LanguageToOutputExtension;
    std::map<cmStdString, cmStdString> ExtensionToLanguage;

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |   44 ++++++++++++++++++++++++++++++++---------
 Source/cmGlobalGenerator.h   |    5 +++-
 Source/cmMakefile.cxx        |    2 +-
 3 files changed, 39 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake