[Cmake-commits] [cmake-commits] martink committed CMakeLists.txt 1.143 1.144

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: undo accidental commit


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.143
retrieving revision 1.144
diff -C 2 -d -r1.143 -r1.144
*** CMakeLists.txt	2 Mar 2008 19:35:13 -0000	1.143
--- CMakeLists.txt	4 Mar 2008 14:10:05 -0000	1.144
***************
*** 135,139 ****
  #-----------------------------------------------------------------------
  MACRO(CMAKE_SETUP_TESTING)
!   SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
    
    IF(BUILD_TESTING)
--- 135,141 ----
  #-----------------------------------------------------------------------
  MACRO(CMAKE_SETUP_TESTING)
!   IF (NOT DART_ROOT)
!     SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
!   ENDIF (NOT DART_ROOT)
    
    IF(BUILD_TESTING)
***************
*** 189,192 ****
--- 191,199 ----
    CONFIGURE_FILE(${CMake_SOURCE_DIR}/CTestCustom.ctest.in
      ${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY)
+   IF(BUILD_TESTING AND DART_ROOT)
+     CONFIGURE_FILE(${CMake_SOURCE_DIR}/CMakeLogo.gif 
+       ${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY)
+   ENDIF(BUILD_TESTING AND DART_ROOT)
+   MARK_AS_ADVANCED(DART_ROOT)
    MARK_AS_ADVANCED(CURL_TESTING)
  ENDMACRO(CMAKE_SETUP_TESTING)
***************
*** 359,363 ****
  # Include the standard Dart testing module
  ENABLE_TESTING()
! INCLUDE (${CMAKE_ROOT}/Modules/CTest.cmake)
  
  # where to write the resulting executables and libraries
--- 366,370 ----
  # Include the standard Dart testing module
  ENABLE_TESTING()
! INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
  
  # where to write the resulting executables and libraries