[cmake-commits] king committed cmake.cxx 1.333 1.334

[cmake-commits at cmake.org]

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

Modified Files:
	cmake.cxx 
Log Message:
COMP: Do not build VS-specific code when generators are not included.


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -d -r1.333 -r1.334
--- cmake.cxx	19 Nov 2007 18:45:16 -0000	1.333
+++ cmake.cxx	19 Nov 2007 19:22:38 -0000	1.334
@@ -68,6 +68,7 @@
 #    include "cmGlobalBorlandMakefileGenerator.h"
 #    include "cmGlobalNMakeMakefileGenerator.h"
 #    include "cmGlobalWatcomWMakeGenerator.h"
+#    define CMAKE_HAVE_VS_GENERATORS
 #  endif
 #  include "cmGlobalMSYSMakefileGenerator.h"
 #  include "cmGlobalMinGWMakefileGenerator.h"
@@ -530,10 +531,12 @@
       {
       this->CheckStampFile = args[++i];
       }
+#if defined(CMAKE_HAVE_VS_GENERATORS)
     else if((i < args.size()-1) && (arg.find("--vs-solution-file",0) == 0))
       {
       this->VSSolutionFile = args[++i];
       }
+#endif
     else if(arg.find("-V",0) == 0)
       {
         this->Verbose = true;
@@ -2103,6 +2106,7 @@
   int ret = this->Configure();
   if (ret || this->ScriptMode)
     {
+#if defined(CMAKE_HAVE_VS_GENERATORS)
     if(!this->VSSolutionFile.empty() && this->GlobalGenerator)
       {
       // CMake is running to regenerate a Visual Studio build tree
@@ -2117,6 +2121,7 @@
       gg->CallVisualStudioMacro(cmGlobalVisualStudioGenerator::MacroStop,
                                 this->VSSolutionFile.c_str());
       }
+#endif
     return ret;
     }
   ret = this->Generate();