[Cmake-commits] [cmake-commits] hoffman committed cmGlobalGenerator.cxx 1.239 1.240

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalGenerator.cxx 
Log Message:
BUG: fix for 7496, do not just report configure done when there is an error during configure


Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.239
retrieving revision 1.240
diff -C 2 -d -r1.239 -r1.240
*** cmGlobalGenerator.cxx	6 Aug 2008 21:48:44 -0000	1.239
--- cmGlobalGenerator.cxx	19 Aug 2008 17:48:21 -0000	1.240
***************
*** 765,769 ****
    if ( !this->CMakeInstance->GetScriptMode() )
      {
!     this->CMakeInstance->UpdateProgress("Configuring done", -1);
      }
  }
--- 765,774 ----
    if ( !this->CMakeInstance->GetScriptMode() )
      {
!     const char* msg = "Configuring done";
!     if(cmSystemTools::GetErrorOccuredFlag())
!       {
!       msg = "Configuring incomplete, errors occurred!";
!       }
!     this->CMakeInstance->UpdateProgress(msg, -1);
      }
  }