diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-14 12:31:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-14 12:31:45 (GMT) |
| commit | cd3bd23266a4a6c00595134a17a8bdaea9e28af5 (patch) | |
| tree | 515fcf4fdee211067497339acb52de321640c4fc /CTestCustom.cmake.in | |
| parent | 9acb4f118cd9a52aaa66897b1c0cd11dace3851c (diff) | |
| parent | 68bc863d5bd64f3e893722e403d4fd56bd2e175a (diff) | |
| download | CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.zip CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.gz CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.bz2 | |
Merge topic 'cleanup-style'
68bc863 Merge branch 'master' into cleanup-style
a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483 Remove trailing TAB from NSIS.template.in
9db3116 Remove CMake-language block-end command arguments
77543bd Convert CMake-language commands to lower case
7bbaa42 Remove trailing whitespace from most CMake and C/C++ code
be9db98 Merge topic 'watcom-compiler-version'
af42ae4 Watcom: Simplify compiler version detection (#11866)
Diffstat (limited to 'CTestCustom.cmake.in')
| -rw-r--r-- | CTestCustom.cmake.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index 9829191..1e6224b 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -1,8 +1,8 @@ -SET(CTEST_CUSTOM_ERROR_MATCH +set(CTEST_CUSTOM_ERROR_MATCH ${CTEST_CUSTOM_ERROR_MATCH} "ERROR:") -SET(CTEST_CUSTOM_WARNING_EXCEPTION +set(CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} "xtree.[0-9]+. : warning C4702: unreachable code" "warning LNK4221" @@ -56,21 +56,21 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION "[0-9,]+ warnings? generated." ) -IF(NOT "@CMAKE_GENERATOR@" MATCHES "Xcode") - SET(CTEST_CUSTOM_COVERAGE_EXCLUDE +if(NOT "@CMAKE_GENERATOR@" MATCHES "Xcode") + set(CTEST_CUSTOM_COVERAGE_EXCLUDE ${CTEST_CUSTOM_COVERAGE_EXCLUDE} "XCode" ) -ENDIF (NOT "@CMAKE_GENERATOR@" MATCHES "Xcode") +endif () -IF(NOT "@CMAKE_GENERATOR@" MATCHES "KDevelop") - SET(CTEST_CUSTOM_COVERAGE_EXCLUDE +if(NOT "@CMAKE_GENERATOR@" MATCHES "KDevelop") + set(CTEST_CUSTOM_COVERAGE_EXCLUDE ${CTEST_CUSTOM_COVERAGE_EXCLUDE} "Kdevelop" ) -ENDIF (NOT "@CMAKE_GENERATOR@" MATCHES "KDevelop") +endif () -SET(CTEST_CUSTOM_COVERAGE_EXCLUDE +set(CTEST_CUSTOM_COVERAGE_EXCLUDE ${CTEST_CUSTOM_COVERAGE_EXCLUDE} # Exclude kwsys files from coverage results. They are reported |