diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-31 14:04:16 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-31 14:04:16 (GMT) |
| commit | f012a95836e14e12f5a445abd72fa79599736641 (patch) | |
| tree | 5df5ea8174a7a1d35b7f383cd641bfb7644c5a7c /Tests/RunCMake/RunCMake.cmake | |
| parent | 8a76536e78e9084fb9636b2f0c57121522cfbbaf (diff) | |
| parent | 071f8e78dda152d8759539fa390b25c7f58d3cc5 (diff) | |
| download | CMake-f012a95836e14e12f5a445abd72fa79599736641.zip CMake-f012a95836e14e12f5a445abd72fa79599736641.tar.gz CMake-f012a95836e14e12f5a445abd72fa79599736641.tar.bz2 | |
Merge topic '16432-static-frameworks'
071f8e78 Apple: Add support for static frameworks
d525754e Xcode: Refactor RunCMake.Framework test to prepare for static frameworks
45405f00 Xcode: Ignore Xcode project warning until issue is fixed
50e1c105 Makefile: For static libraries remove only the "real" lib before creating
8643ca75 Makefile: Re-order list of files to clean
Diffstat (limited to 'Tests/RunCMake/RunCMake.cmake')
| -rw-r--r-- | Tests/RunCMake/RunCMake.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 6cc3054..5f66da0 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -101,7 +101,7 @@ function(run_cmake test) endif() foreach(o out err) string(REGEX REPLACE "\r\n" "\n" actual_std${o} "${actual_std${o}}") - string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned|[^\n]*from Time Machine by path|[^\n]*Bullseye Testing Technology)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}") + string(REGEX REPLACE "(^|\n)((==[0-9]+==|BullseyeCoverage|[a-z]+\\([0-9]+\\) malloc:|Error kstat returned|[^\n]*is a member of multiple groups|[^\n]*from Time Machine by path|[^\n]*Bullseye Testing Technology)[^\n]*\n)+" "\\1" actual_std${o} "${actual_std${o}}") string(REGEX REPLACE "\n+$" "" actual_std${o} "${actual_std${o}}") set(expect_${o} "") if(DEFINED expect_std${o}) |