Google Git
Sign in
fuchsia/third_party/github.com/Kitware/CMake/1a16e4fc69c072c06858c63c6f9ec69739f8720f
commit
1a16e4fc69c072c06858c63c6f9ec69739f8720f
[log]
author
Brad King <brad.king@kitware.com>
Thu Oct 02 15:31:06 2025 -0400
committer
Brad King <brad.king@kitware.com>
Thu Oct 02 15:31:06 2025 -0400
tree
481f812cc751fd2d6965e013e97fd8c3eb5e4b2b
parent
87a661a916f05d0334c8f9ef4e8719a6ca157c3e [diff]
parent
ab0a44a0a0b54622f247f226c8f3347fcfd884b7 [diff]
Merge branch 'backport-pkg-root-var' into pkg-root-var

Use the `-s ours` strategy because we already made equivalent changes.
tree: 481f812cc751fd2d6965e013e97fd8c3eb5e4b2b
  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. .gitattributes
  17. .gitignore
  18. .gitlab-ci.yml
  19. .hooks-config
  20. .pre-commit-config.yaml
  21. .typos.toml
  22. bootstrap
  23. cmake_uninstall.cmake.in
  24. CMakeCPack.cmake
  25. CMakeCPackOptions.cmake.in
  26. CMakeGraphVizOptions.cmake
  27. CMakeLists.txt
  28. CMakeLogo.gif
  29. CompileFlags.cmake
  30. configure
  31. CONTRIBUTING.rst
  32. CONTRIBUTORS.rst
  33. CTestConfig.cmake
  34. CTestCustom.cmake.in
  35. DartConfig.cmake
  36. LICENSE.rst
  37. README.rst
  38. sgconfig.yml