Google Git
Sign in
fuchsia/third_party/github.com/Kitware/CMake/7406445b9e23a1b664779af99dd283cafa688985
commit
7406445b9e23a1b664779af99dd283cafa688985
[log]
author
Brad King <brad.king@kitware.com>
Thu Dec 11 14:43:05 2025 -0500
committer
Brad King <brad.king@kitware.com>
Thu Dec 11 14:43:05 2025 -0500
tree
7a1fc4f71cbeb3fea9fc7166c1848d26087d4e93
parent
5ccd0e39e4ccf7a738118a167145b3e2883ec77e [diff]
parent
16cc3e25d400e043a88297e375590420658bab19 [diff]
Merge branch 'backport-linux32-system-libarchive'

Use the `-s ours` strategy to avoid conflicts.
We've already made equivalent changes.
tree: 7a1fc4f71cbeb3fea9fc7166c1848d26087d4e93
  1. .github/
  2. .gitlab/
  3. Auxiliary/
  4. Help/
  5. Licenses/
  6. Modules/
  7. Packaging/
  8. Source/
  9. Templates/
  10. Tests/
  11. Utilities/
  12. .clang-format
  13. .clang-tidy
  14. .codespellrc
  15. .editorconfig
  16. .git-remote-files
  17. .gitattributes
  18. .gitignore
  19. .gitlab-ci.yml
  20. .hooks-config
  21. .pre-commit-config.yaml
  22. .typos.toml
  23. bootstrap
  24. cmake_uninstall.cmake.in
  25. CMakeCPack.cmake
  26. CMakeCPackOptions.cmake.in
  27. CMakeGraphVizOptions.cmake
  28. CMakeLists.txt
  29. CMakeLogo.gif
  30. CMP0207-NEW-all-result.txt
  31. CMP0207-NEW-all-stderr.txt
  32. CompileFlags.cmake
  33. configure
  34. CONTRIBUTING.rst
  35. CONTRIBUTORS.rst
  36. CTestConfig.cmake
  37. CTestCustom.cmake.in
  38. DartConfig.cmake
  39. LICENSE.rst
  40. README.rst
  41. sgconfig.yml