Przeglądaj źródła

CTEST_CUSTOM_*: treat variables as lists

Ben Boeckel 10 lat temu
rodzic
commit
71c67e83bf
2 zmienionych plików z 6 dodań i 12 usunięć
  1. 5 11
      CTestCustom.cmake.in
  2. 1 1
      Modules/CTestCoverageCollectGCOV.cmake

+ 5 - 11
CTestCustom.cmake.in

@@ -1,9 +1,7 @@
-set(CTEST_CUSTOM_ERROR_MATCH
-  ${CTEST_CUSTOM_ERROR_MATCH}
+list(APPEND CTEST_CUSTOM_ERROR_MATCH
   "ERROR:")
   "ERROR:")
 
 
-set(CTEST_CUSTOM_WARNING_EXCEPTION
-  ${CTEST_CUSTOM_WARNING_EXCEPTION}
+list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
   "xtree.[0-9]+. : warning C4702: unreachable code"
   "xtree.[0-9]+. : warning C4702: unreachable code"
   "warning LNK4221"
   "warning LNK4221"
   "warning LNK4204" # Occurs by race condition with objects in small libs
   "warning LNK4204" # Occurs by race condition with objects in small libs
@@ -84,22 +82,18 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
   )
   )
 
 
 if(NOT "@CMAKE_GENERATOR@" MATCHES "Xcode")
 if(NOT "@CMAKE_GENERATOR@" MATCHES "Xcode")
-  set(CTEST_CUSTOM_COVERAGE_EXCLUDE
-    ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
+  list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE
     "XCode"
     "XCode"
     )
     )
 endif ()
 endif ()
 
 
 if(NOT "@CMAKE_GENERATOR@" MATCHES "KDevelop")
 if(NOT "@CMAKE_GENERATOR@" MATCHES "KDevelop")
-  set(CTEST_CUSTOM_COVERAGE_EXCLUDE
-    ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
+  list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE
     "Kdevelop"
     "Kdevelop"
     )
     )
 endif ()
 endif ()
 
 
-set(CTEST_CUSTOM_COVERAGE_EXCLUDE
-  ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
-
+list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE
   # Exclude kwsys files from coverage results. They are reported
   # Exclude kwsys files from coverage results. They are reported
   # (with better coverage results) on kwsys dashboards...
   # (with better coverage results) on kwsys dashboards...
   "/Source/(cm|kw)sys/"
   "/Source/(cm|kw)sys/"

+ 1 - 1
Modules/CTestCoverageCollectGCOV.cmake

@@ -161,7 +161,7 @@ function(ctest_coverage_collect_gcov)
       message(STATUS "Could not determine source file corresponding to: ${gcov_file}")
       message(STATUS "Could not determine source file corresponding to: ${gcov_file}")
     endif()
     endif()
 
 
-    foreach(exclude_entry ${CTEST_CUSTOM_COVERAGE_EXCLUDE})
+    foreach(exclude_entry IN LISTS CTEST_CUSTOM_COVERAGE_EXCLUDE)
       if(source_file MATCHES "${exclude_entry}")
       if(source_file MATCHES "${exclude_entry}")
         set(is_excluded true)
         set(is_excluded true)