[Cmake-commits] [cmake-commits] king committed cmGlobalGenerator.cxx 1.238 1.239

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalGenerator.cxx 
Log Message:
BUG: Fix crash on circular target dependencies

After reporting an error about circular target dependencies do not try
to continue generation because the dependency computation object is not
in a useful state.


Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.238
retrieving revision 1.239
diff -C 2 -d -r1.238 -r1.239
*** cmGlobalGenerator.cxx	30 Jul 2008 19:18:19 -0000	1.238
--- cmGlobalGenerator.cxx	6 Aug 2008 21:48:44 -0000	1.239
***************
*** 861,865 ****
    {
    cmComputeTargetDepends ctd(this);
!   ctd.Compute();
    std::vector<cmTarget*> const& targets = ctd.GetTargets();
    for(std::vector<cmTarget*>::const_iterator ti = targets.begin();
--- 861,868 ----
    {
    cmComputeTargetDepends ctd(this);
!   if(!ctd.Compute())
!     {
!     return;
!     }
    std::vector<cmTarget*> const& targets = ctd.GetTargets();
    for(std::vector<cmTarget*>::const_iterator ti = targets.begin();