[cmake-commits] hoffman committed CMakeLists.txt 1.289.2.10 1.289.2.11 cmLocalVisualStudio7Generator.h 1.22.2.7 1.22.2.8 cmake.cxx 1.247.2.12 1.247.2.13

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv28246/Source

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt cmLocalVisualStudio7Generator.h cmake.cxx 
Log Message:
ENH: merge in from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.289.2.10
retrieving revision 1.289.2.11
diff -u -d -r1.289.2.10 -r1.289.2.11
--- CMakeLists.txt	16 Mar 2007 22:05:42 -0000	1.289.2.10
+++ CMakeLists.txt	18 Dec 2007 20:02:08 -0000	1.289.2.11
@@ -200,8 +200,12 @@
       cmGlobalVisualStudio7Generator.h
       cmGlobalVisualStudio8Generator.cxx
       cmGlobalVisualStudio8Generator.h
+      cmGlobalVisualStudio9Generator.cxx
+      cmGlobalVisualStudio9Generator.h
       cmGlobalVisualStudio8Win64Generator.cxx
       cmGlobalVisualStudio8Win64Generator.h
+      cmGlobalVisualStudio9Win64Generator.cxx
+      cmGlobalVisualStudio9Win64Generator.h
       cmGlobalWatcomWMakeGenerator.cxx
       cmLocalVisualStudio6Generator.cxx
       cmLocalVisualStudio6Generator.h

Index: cmLocalVisualStudio7Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.h,v
retrieving revision 1.22.2.7
retrieving revision 1.22.2.8
diff -u -d -r1.22.2.7 -r1.22.2.8
--- cmLocalVisualStudio7Generator.h	12 Dec 2007 03:28:45 -0000	1.22.2.7
+++ cmLocalVisualStudio7Generator.h	18 Dec 2007 20:02:08 -0000	1.22.2.8
@@ -64,6 +64,7 @@
     }
   void SetVersion71() {this->Version = 71;}
   void SetVersion8() {this->Version = 8;}
+  void SetVersion9() {this->Version = 9;}
   void SetPlatformName(const char* n) { this->PlatformName = n;}
   virtual void ConfigureFinalPass();
   

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.247.2.12
retrieving revision 1.247.2.13
diff -u -d -r1.247.2.12 -r1.247.2.13
--- cmake.cxx	17 Dec 2007 22:40:58 -0000	1.247.2.12
+++ cmake.cxx	18 Dec 2007 20:02:08 -0000	1.247.2.13
@@ -53,6 +53,8 @@
 #    include "cmGlobalVisualStudio7Generator.h"
 #    include "cmGlobalVisualStudio71Generator.h"
 #    include "cmGlobalVisualStudio8Generator.h"
+#    include "cmGlobalVisualStudio9Generator.h"
+#    include "cmGlobalVisualStudio9Win64Generator.h"
 #    include "cmGlobalVisualStudio8Win64Generator.h"
 #    include "cmGlobalBorlandMakefileGenerator.h"
 #    include "cmGlobalNMakeMakefileGenerator.h"
@@ -1940,6 +1942,10 @@
     &cmGlobalVisualStudio71Generator::New;
   this->Generators[cmGlobalVisualStudio8Generator::GetActualName()] =
     &cmGlobalVisualStudio8Generator::New;
+  this->Generators[cmGlobalVisualStudio9Generator::GetActualName()] =
+    &cmGlobalVisualStudio9Generator::New;
+  this->Generators[cmGlobalVisualStudio9Win64Generator::GetActualName()] =
+    &cmGlobalVisualStudio9Win64Generator::New;
   this->Generators[cmGlobalVisualStudio8Win64Generator::GetActualName()] =
     &cmGlobalVisualStudio8Win64Generator::New;
   this->Generators[cmGlobalBorlandMakefileGenerator::GetActualName()] =