kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CTEST_CUSTOM_*: treat variables as lists

This commit is contained in:
Ben Boeckel 2015-09-17 10:52:17 -04:00 committed by Brad King
parent 936a95d405
commit 71c67e83bf
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CTestCustom.cmake.in
View File

@ -1,9 +1,7 @@
set(CTEST_CUSTOM_ERROR_MATCH list(APPEND CTEST_CUSTOM_ERROR_MATCH
${CTEST_CUSTOM_ERROR_MATCH}
"ERROR:") "ERROR:")
set(CTEST_CUSTOM_WARNING_EXCEPTION list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
${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 list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE
${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 list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE
${CTEST_CUSTOM_COVERAGE_EXCLUDE}
"Kdevelop" "Kdevelop"
) )
endif () endif ()
set(CTEST_CUSTOM_COVERAGE_EXCLUDE list(APPEND CTEST_CUSTOM_COVERAGE_EXCLUDE
${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/"

2
Modules/CTestCoverageCollectGCOV.cmake
View File

@ -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)