mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-26 08:29:54 -06:00
Merge topic 'kwsys-import-cleanup'
93219c40Merge branch 'upstream-KWSys' into kwsys-import-cleanup22729eaeKWSys 2017-04-20 (8785f84f)d88a511dkwsys: match upstream changesa139b81aupdate-kwsys: apply changes made in CMake to the importe832c32ckwsys: remove extra attribute Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Brad King <brad.king@kitware.com> Merge-request: !728
This commit is contained in:
16
Source/kwsys/.gitattributes
vendored
16
Source/kwsys/.gitattributes
vendored
@@ -1,15 +1,13 @@
|
||||
.git* export-ignore
|
||||
|
||||
*.c our-c-style
|
||||
*.c.in our-c-style
|
||||
*.cxx our-c-style
|
||||
*.h our-c-style
|
||||
*.h.in our-c-style
|
||||
*.hxx our-c-style
|
||||
*.hxx.in our-c-style
|
||||
*.c kwsys-c-style
|
||||
*.c.in kwsys-c-style
|
||||
*.cxx kwsys-c-style
|
||||
*.h kwsys-c-style
|
||||
*.h.in kwsys-c-style
|
||||
*.hxx kwsys-c-style
|
||||
*.hxx.in kwsys-c-style
|
||||
|
||||
*.cmake whitespace=tab-in-indent
|
||||
*.rst whitespace=tab-in-indent conflict-marker-size=79
|
||||
*.txt whitespace=tab-in-indent
|
||||
|
||||
* -format.clang-format
|
||||
|
||||
@@ -15,7 +15,8 @@ readonly paths="
|
||||
|
||||
extract_source () {
|
||||
git_archive
|
||||
disable_custom_gitattributes
|
||||
sed -i -e '/import off/,/import on/d' "$extractdir/$name-reduced/.gitattributes"
|
||||
sed -i -e 's/project=KWSys/project=PublicDashboard/' "$extractdir/$name-reduced/CTestConfig.cmake"
|
||||
}
|
||||
|
||||
export HOOKS_ALLOW_KWSYS=1
|
||||
|
||||
Reference in New Issue
Block a user