diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-21 12:56:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-21 12:56:08 (GMT) |
| commit | ecf94cbc51629eca98ea602e03f5a3e2e6ff36ce (patch) | |
| tree | 71655052a5deb32f20a856415f503c0767500659 | |
| parent | 744f80976553503ba9b480996a1b290596b74bd4 (diff) | |
| parent | 93219c40031bbac73c160500f63134e71ff4f455 (diff) | |
| download | CMake-ecf94cbc51629eca98ea602e03f5a3e2e6ff36ce.zip CMake-ecf94cbc51629eca98ea602e03f5a3e2e6ff36ce.tar.gz CMake-ecf94cbc51629eca98ea602e03f5a3e2e6ff36ce.tar.bz2 | |
Merge topic 'kwsys-import-cleanup'
93219c40 Merge branch 'upstream-KWSys' into kwsys-import-cleanup
22729eae KWSys 2017-04-20 (8785f84f)
d88a511d kwsys: match upstream changes
a139b81a update-kwsys: apply changes made in CMake to the import
e832c32c kwsys: remove extra attribute
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !728
| -rw-r--r-- | Source/kwsys/.gitattributes | 16 | ||||
| -rwxr-xr-x | Utilities/Scripts/update-kwsys.bash | 3 |
2 files changed, 9 insertions, 10 deletions
diff --git a/Source/kwsys/.gitattributes b/Source/kwsys/.gitattributes index 3583f39..7065eb5 100644 --- a/Source/kwsys/.gitattributes +++ b/Source/kwsys/.gitattributes @@ -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 diff --git a/Utilities/Scripts/update-kwsys.bash b/Utilities/Scripts/update-kwsys.bash index d5485aa..dfbd366 100755 --- a/Utilities/Scripts/update-kwsys.bash +++ b/Utilities/Scripts/update-kwsys.bash @@ -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 |