diff options
author | Brad King <brad.king@kitware.com> | 2020-02-13 14:30:35 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-02-13 17:57:52 (GMT) |
commit | 5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd (patch) | |
tree | 3d39cf776650ac89bedec4fc1d251ff70e6fc8d7 /Utilities/cmlibarchive/CTestConfig.cmake | |
parent | 9a27ecd4162aebfb595b7a02b958b7dfb95256d8 (diff) | |
parent | 8cce62295a5ddca3e0d1fd7cff0229054972dfe3 (diff) | |
download | CMake-5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd.zip CMake-5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd.tar.gz CMake-5d8b3aec0cb8652ae867ff08d2e7bfa2060138dd.tar.bz2 |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2020-02-11 (3288ebb0)
Also manually restore content from upstream libarchive's main
`CMakeLists.txt` file that was removed by previous commits and
exclude it with `IF(0)` blocks. Do this as an evil merge so
that `git blame -C` can follow the content to upstream.
Diffstat (limited to 'Utilities/cmlibarchive/CTestConfig.cmake')
0 files changed, 0 insertions, 0 deletions