[cmake-commits] king committed CMakeLists.txt 1.129 1.130 CTestCustom.cmake.in NONE 1.1 CTestCustom.ctest.in 1.19 1.20

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt CTestCustom.ctest.in 
Added Files:
	CTestCustom.cmake.in 
Log Message:
ENH: Create CTestCustom.cmake instead of CTestCustom.ctest.  Create the old file to include the new one for compatibility.  This should prevent the long delays of CTest traversing the whole tree looking for CTestCustom.ctest files.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- CMakeLists.txt	28 Aug 2007 15:02:24 -0000	1.129
+++ CMakeLists.txt	31 Aug 2007 18:51:09 -0000	1.130
@@ -186,6 +186,8 @@
     ${CMake_BINARY_DIR}/Tests/.NoDartCoverage)
   CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/.NoDartCoverage
     ${CMake_BINARY_DIR}/Modules/.NoDartCoverage)
+  CONFIGURE_FILE(${CMake_SOURCE_DIR}/CTestCustom.cmake.in
+    ${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)

Index: CTestCustom.ctest.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CTestCustom.ctest.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- CTestCustom.ctest.in	27 Oct 2006 19:55:14 -0000	1.19
+++ CTestCustom.ctest.in	31 Aug 2007 18:51:09 -0000	1.20
@@ -1,41 +1,3 @@
-SET(CTEST_CUSTOM_WARNING_EXCEPTION
-  ${CTEST_CUSTOM_WARNING_EXCEPTION}
-  "xtree.[0-9]+. : warning C4702: unreachable code"
-  "warning LNK4221"
-  "variable .var_args[2]*. is used before its value is set"
-  "jobserver unavailable"
-  "warning: \\(Long double usage is reported only once for each file"
-  "warning: To disable this warning use"
-  "could not be inlined"
-  "libcmcurl.*has no symbols"
-  "not sorted slower link editing will result"
-  "stl_deque.h:479"
-  "Utilities.cmzlib."
-  "Utilities.cmxmlrpc."
-  "Source.CTest.Curl"
-  "Utilities.cmcurl"
-  "Source.CursesDialog.form"
-  "/usr/bin/ld.*warning.*-..*directory.name.*bin.*does not exist"
-  "Redeclaration of .send..... with a different storage class specifier"
-  "Utilities.cmexpat."
-  "is not used for resolving any symbol"
-  "Clock skew detected"
-  "remark\\(1209"
-  "stl_deque.h:1051"
-  )
-
-
-IF(NOT "@CMAKE_GENERATOR@" MATCHES "Xcode")
-  SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
-    ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
-    "XCode"
-    )
-ENDIF (NOT "@CMAKE_GENERATOR@" MATCHES "Xcode")
-
-IF(NOT "@CMAKE_GENERATOR@" MATCHES "KDevelop")
-  SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
-    ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
-    "Kdevelop"
-    )
-ENDIF (NOT "@CMAKE_GENERATOR@" MATCHES "KDevelop")
-
+# This file is provided for compatibility with CMake 2.2 and lower.
+# Just include the custom file by its new name.
+INCLUDE("CTestCustom.cmake")

--- NEW FILE: CTestCustom.cmake.in ---
SET(CTEST_CUSTOM_WARNING_EXCEPTION
  ${CTEST_CUSTOM_WARNING_EXCEPTION}
  "xtree.[0-9]+. : warning C4702: unreachable code"
  "warning LNK4221"
  "variable .var_args[2]*. is used before its value is set"
  "jobserver unavailable"
  "warning: \\(Long double usage is reported only once for each file"
  "warning: To disable this warning use"
  "could not be inlined"
  "libcmcurl.*has no symbols"
  "not sorted slower link editing will result"
  "stl_deque.h:479"
  "Utilities.cmzlib."
  "Utilities.cmxmlrpc."
  "Source.CTest.Curl"
  "Utilities.cmcurl"
  "Source.CursesDialog.form"
  "/usr/bin/ld.*warning.*-..*directory.name.*bin.*does not exist"
  "Redeclaration of .send..... with a different storage class specifier"
  "Utilities.cmexpat."
  "is not used for resolving any symbol"
  "Clock skew detected"
  "remark\\(1209"
  "stl_deque.h:1051"
  )


IF(NOT "@CMAKE_GENERATOR@" MATCHES "Xcode")
  SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
    ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
    "XCode"
    )
ENDIF (NOT "@CMAKE_GENERATOR@" MATCHES "Xcode")

IF(NOT "@CMAKE_GENERATOR@" MATCHES "KDevelop")
  SET(CTEST_CUSTOM_COVERAGE_EXCLUDE
    ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
    "Kdevelop"
    )
ENDIF (NOT "@CMAKE_GENERATOR@" MATCHES "KDevelop")