[Cmake-commits] [cmake-commits] hoffman committed cmGlobalNMakeMakefileGenerator.cxx 1.26 1.27

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalNMakeMakefileGenerator.cxx 
Log Message:
ENH: better error message for mis-configured nmake environment


Index: cmGlobalNMakeMakefileGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalNMakeMakefileGenerator.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -C 2 -d -r1.26 -r1.27
*** cmGlobalNMakeMakefileGenerator.cxx	13 Jan 2008 21:36:20 -0000	1.26
--- cmGlobalNMakeMakefileGenerator.cxx	14 Oct 2008 15:42:45 -0000	1.27
***************
*** 35,38 ****
--- 35,51 ----
    mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
    mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
+   if(!(cmSystemTools::GetEnv("INCLUDE") && 
+        cmSystemTools::GetEnv("LIB") &&
+        cmSystemTools::GetEnv("LIBPATH"))
+     )
+     {
+     std::string message = "To use the NMake generator, cmake must be run "
+       "from a shell that can use the compiler cl from the command line. "
+       "This environment does not contain INCLUDE, LIB, or LIBPATH, and "
+       "these must be set for the cl compiler to work. ";
+     mf->IssueMessage(cmake::WARNING,
+                      message);
+     }
+   
    this->cmGlobalUnixMakefileGenerator3::EnableLanguage(l, mf, optional);
  }