[cmake-commits] martink committed CMakeLists.txt 1.141 1.142 bootstrap 1.111 1.112

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt bootstrap 
Log Message:
ENH: add first cut and policies still need to add the doc support


Index: bootstrap
===================================================================
RCS file: /cvsroot/CMake/CMake/bootstrap,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- bootstrap	21 Feb 2008 16:41:10 -0000	1.111
+++ bootstrap	1 Mar 2008 20:20:34 -0000	1.112
@@ -137,6 +137,7 @@
   cmCommandArgumentParserHelper \
   cmDepends \
   cmDependsC \
+  cmPolicies \
   cmProperty \
   cmPropertyMap \
   cmPropertyDefinition \

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- CMakeLists.txt	18 Feb 2008 20:50:37 -0000	1.141
+++ CMakeLists.txt	1 Mar 2008 20:20:34 -0000	1.142
@@ -134,9 +134,7 @@
 # for testing. Simply to improve readability of the main script.
 #-----------------------------------------------------------------------
 MACRO(CMAKE_SETUP_TESTING)
-  IF (NOT DART_ROOT)
-    SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
-  ENDIF (NOT DART_ROOT)
+  SET(MAKEPROGRAM ${CMAKE_MAKE_PROGRAM})
   
   IF(BUILD_TESTING)
     SET(CMAKE_TEST_GENERATOR "" CACHE STRING 
@@ -190,11 +188,6 @@
     ${CMake_BINARY_DIR}/CTestCustom.cmake @ONLY)
   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)
 
@@ -365,7 +358,7 @@
 
 # Include the standard Dart testing module
 ENABLE_TESTING()
-INCLUDE (${CMAKE_ROOT}/Modules/Dart.cmake)
+INCLUDE (${CMAKE_ROOT}/Modules/CTest.cmake)
 
 # where to write the resulting executables and libraries
 SET(BUILD_SHARED_LIBS OFF)