[Cmake-commits] [cmake-commits] hoffman committed cmEnableLanguageCommand.cxx 1.5 1.6

[cmake-commits at cmake.org]

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

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


Index: cmEnableLanguageCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmEnableLanguageCommand.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmEnableLanguageCommand.cxx	23 Jan 2008 15:27:59 -0000	1.5
--- cmEnableLanguageCommand.cxx	14 Oct 2008 15:43:35 -0000	1.6
***************
*** 26,32 ****
      {
      this->SetError
!       ("ENABLE_LANGUAGE called with incorrect number of arguments");
      return false;
      } 
    for (std::vector<std::string>::const_iterator it = args.begin();
         it != args.end();
--- 26,39 ----
      {
      this->SetError
!       ("called with incorrect number of arguments");
      return false;
      } 
+   if(this->Makefile->GetCMakeInstance()->GetIsInTryCompile())
+     {
+     this->SetError
+       ("called from a try_compile, "
+        "all languages must be enabled before trying them.");
+     return false;
+     }
    for (std::vector<std::string>::const_iterator it = args.begin();
         it != args.end();