[Cmake-commits] CMake branch, next, updated. v2.8.3-1125-g0c99e2a

[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, next has been updated
       via  0c99e2af6ed0f845ed454c7fde98bbdf84a1b6d9 (commit)
       via  971692c0559ad908f7a1177fbe62d273945601db (commit)
      from  ee1ab90a28abd288584b6e36fa8df223da4ddc93 (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=0c99e2af6ed0f845ed454c7fde98bbdf84a1b6d9
commit 0c99e2af6ed0f845ed454c7fde98bbdf84a1b6d9
Merge: ee1ab90 971692c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 30 13:07:00 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 30 13:07:00 2010 -0500

    Merge topic 'add_support_for_windres' into next
    
    971692c Build enable_language command during bootstrap


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=971692c0559ad908f7a1177fbe62d273945601db
commit 971692c0559ad908f7a1177fbe62d273945601db
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 30 12:59:57 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 30 12:59:57 2010 -0500

    Build enable_language command during bootstrap
    
    Commit 060d6e88 (Add support for windres to cygwin, 2010-12-23) and
    commit b2f308c8 (Add support for windows resources with mingw/msys,
    2010-12-22) introduced enable_language(RC) for the first time in a
    platform file processed by a bootstrap-built cmake.

diff --git a/Source/cmBootstrapCommands.cxx b/Source/cmBootstrapCommands.cxx
index db01688..554f452 100644
--- a/Source/cmBootstrapCommands.cxx
+++ b/Source/cmBootstrapCommands.cxx
@@ -32,6 +32,7 @@
 #include "cmCreateTestSourceList.cxx"
 #include "cmDefinePropertyCommand.cxx"
 #include "cmElseCommand.cxx"
+#include "cmEnableLanguageCommand.cxx"
 #include "cmEnableTestingCommand.cxx"
 #include "cmEndForEachCommand.cxx"
 #include "cmEndFunctionCommand.cxx"
@@ -109,6 +110,7 @@ void GetBootstrapCommands(std::list<cmCommand*>& commands)
   commands.push_back(new cmCreateTestSourceList);
   commands.push_back(new cmDefinePropertyCommand);
   commands.push_back(new cmElseCommand);
+  commands.push_back(new cmEnableLanguageCommand);
   commands.push_back(new cmEnableTestingCommand);  
   commands.push_back(new cmEndForEachCommand);
   commands.push_back(new cmEndFunctionCommand);
diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx
index 1950871..bb1e4e2 100644
--- a/Source/cmCommands.cxx
+++ b/Source/cmCommands.cxx
@@ -14,7 +14,6 @@
 #include "cmAuxSourceDirectoryCommand.cxx"
 #include "cmBuildNameCommand.cxx"
 #include "cmElseIfCommand.cxx"
-#include "cmEnableLanguageCommand.cxx"
 #include "cmEndWhileCommand.cxx"
 #include "cmExportCommand.cxx"
 #include "cmExportLibraryDependencies.cxx"
@@ -54,7 +53,6 @@ void GetPredefinedCommands(std::list<cmCommand*>&
   commands.push_back(new cmAuxSourceDirectoryCommand);
   commands.push_back(new cmBuildNameCommand);
   commands.push_back(new cmElseIfCommand);
-  commands.push_back(new cmEnableLanguageCommand);
   commands.push_back(new cmEndWhileCommand);
   commands.push_back(new cmExportCommand);
   commands.push_back(new cmExportLibraryDependenciesCommand);

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

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


hooks/post-receive
-- 
CMake