diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-17 19:44:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-17 19:44:17 (GMT) |
| commit | 4e61edc4577b5e01dd6bd802b9b4779e1985f77d (patch) | |
| tree | 38500bfcd86831897ab462356b318cb0930911c3 | |
| parent | bd62c5211576d626d19a27d389d1fa7b42390576 (diff) | |
| parent | 2a3e263173e10de4a067a9de61318f6d6e0f0f17 (diff) | |
| download | CMake-4e61edc4577b5e01dd6bd802b9b4779e1985f77d.zip CMake-4e61edc4577b5e01dd6bd802b9b4779e1985f77d.tar.gz CMake-4e61edc4577b5e01dd6bd802b9b4779e1985f77d.tar.bz2 | |
Merge topic 'test-CheckSourceTree-update'
2a3e2631 Tests: Fix CheckSourceTree test for newer Git
| -rw-r--r-- | Tests/CMakeTests/CheckSourceTreeTest.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in index 59b2890..33fe5f3 100644 --- a/Tests/CMakeTests/CheckSourceTreeTest.cmake.in +++ b/Tests/CMakeTests/CheckSourceTreeTest.cmake.in @@ -268,12 +268,12 @@ if(NOT ov STREQUAL "") if(consider) if(is_git_checkout) - if(line MATCHES "^#[ \t]*modified:") + if(line MATCHES "^#?[ \t]*modified:") message(" locally modified file detected...") set(modifications 1) endif() - if(line MATCHES "^# Untracked") + if(line MATCHES "^(# )?Untracked") message(" locally non-added file/directory detected...") set(nonadditions 1) endif() |