瀏覽代碼

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.

Brad King 18 年之前
父節點
當前提交
b8ac3158ce
共有 3 個文件被更改,包括 46 次插入41 次删除
  1. 2 0
      CMakeLists.txt
  2. 41 0
      CTestCustom.cmake.in
  3. 3 41
      CTestCustom.ctest.in

+ 2 - 0
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)

+ 41 - 0
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")
+

+ 3 - 41
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")