3 files changed, 46 insertions, 41 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d32ffc2441..89bbc546f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,6 +186,8 @@ MACRO(CMAKE_SETUP_TESTING)
     ${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)
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
new file mode 100644
index 0000000000..f6640f3ac7
--- /dev/null
+++ b/CTestCustom.cmake.in
@@ -0,0 +1,41 @@
+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")
+
diff --git a/CTestCustom.ctest.in b/CTestCustom.ctest.in
index f6640f3ac7..6127843f64 100644
--- a/CTestCustom.ctest.in
+++ b/CTestCustom.ctest.in
@@ -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")