diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-30 11:05:21 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-30 12:29:43 (GMT) |
| commit | ebc91a4452e1b2c2a1f42643d4a01deceea07a2b (patch) | |
| tree | 254b45dd30eeccaee9060690c9f8dcd53b00104c /Tests/RunCMake/Syntax | |
| parent | c69b4c8dfef08197d620932212d49366d22c0f45 (diff) | |
| download | CMake-ebc91a4452e1b2c2a1f42643d4a01deceea07a2b.zip CMake-ebc91a4452e1b2c2a1f42643d4a01deceea07a2b.tar.gz CMake-ebc91a4452e1b2c2a1f42643d4a01deceea07a2b.tar.bz2 | |
Avoid CRLF newlines in Git repo blobs
In commit 8ed03baa76 (gitattributes: prefer `eol=crlf` to `-crlf`,
2017-08-23) we left a few CRLF blobs in the repository. Some Git
versions get confused by text files with CRLF blobs. Convert them
to LF blobs. Use the `eol=crlf` attribute to tell Git to use CRLF
on checkout.
Diffstat (limited to 'Tests/RunCMake/Syntax')
| -rw-r--r-- | Tests/RunCMake/Syntax/.gitattributes | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/BracketCRLF.cmake | 16 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/StringCRLF.cmake | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/Tests/RunCMake/Syntax/.gitattributes b/Tests/RunCMake/Syntax/.gitattributes index 35a9eaf..79af285 100644 --- a/Tests/RunCMake/Syntax/.gitattributes +++ b/Tests/RunCMake/Syntax/.gitattributes @@ -1,3 +1,3 @@ CommandTabs.cmake whitespace=-tab-in-indent -StringCRLF.cmake whitespace=cr-at-eol -crlf -BracketCRLF.cmake whitespace=cr-at-eol -crlf +StringCRLF.cmake eol=crlf +BracketCRLF.cmake eol=crlf diff --git a/Tests/RunCMake/Syntax/BracketCRLF.cmake b/Tests/RunCMake/Syntax/BracketCRLF.cmake index bda0e17..2ea6df2 100644 --- a/Tests/RunCMake/Syntax/BracketCRLF.cmake +++ b/Tests/RunCMake/Syntax/BracketCRLF.cmake @@ -1,8 +1,8 @@ -if([[
-]] STREQUAL "" AND
-[[a
-b]] STREQUAL "a\nb")
- message("CRLF->LF worked")
-else()
- message(FATAL_ERROR "CRLF->LF failed")
-endif()
+if([[ +]] STREQUAL "" AND +[[a +b]] STREQUAL "a\nb") + message("CRLF->LF worked") +else() + message(FATAL_ERROR "CRLF->LF failed") +endif() diff --git a/Tests/RunCMake/Syntax/StringCRLF.cmake b/Tests/RunCMake/Syntax/StringCRLF.cmake index d20cfea..14aad31 100644 --- a/Tests/RunCMake/Syntax/StringCRLF.cmake +++ b/Tests/RunCMake/Syntax/StringCRLF.cmake @@ -1,6 +1,6 @@ -if("a
-b" STREQUAL "a\nb")
- message("CRLF->LF worked")
-else()
- message(FATAL_ERROR "CRLF->LF failed")
-endif()
+if("a +b" STREQUAL "a\nb") + message("CRLF->LF worked") +else() + message(FATAL_ERROR "CRLF->LF failed") +endif() |