[Cmake-commits] [cmake-commits] hoffman committed cmCTestBuildAndTestHandler.cxx 1.20.2.1 1.20.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmCTestBuildAndTestHandler.cxx 
Log Message:
ENH: 2.6.2 RC 3, merge in changes from main tree


Index: cmCTestBuildAndTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestBuildAndTestHandler.cxx,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C 2 -d -r1.20.2.1 -r1.20.2.2
*** cmCTestBuildAndTestHandler.cxx	25 Jun 2008 13:51:40 -0000	1.20.2.1
--- cmCTestBuildAndTestHandler.cxx	4 Sep 2008 21:10:45 -0000	1.20.2.2
***************
*** 80,84 ****
      }
  #ifdef CMAKE_INTDIR
!   config = CMAKE_INTDIR;
  #endif
    
--- 80,87 ----
      }
  #ifdef CMAKE_INTDIR
!   if(!config)
!     {
!     config = CMAKE_INTDIR;
!     }
  #endif
    
***************
*** 260,264 ****
        }
  #ifdef CMAKE_INTDIR
!     config = CMAKE_INTDIR;
  #endif
      if(!config)
--- 263,270 ----
        }
  #ifdef CMAKE_INTDIR
!     if(!config)
!       {
!       config = CMAKE_INTDIR;
!       }
  #endif
      if(!config)