summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-10-05 14:01:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-10-05 14:01:52 -0700
commit8250ab0b8c814ce4491b57a52c7d6d95fa01d992 (patch)
treefc97a121466478a309a458eea929cfb007d20c22 /.gitignore
parentMerge branch 'ma/worktree-cleanups' (diff)
parenthashmap_for_each_entry(): workaround MSVC's runtime check failure #3 (diff)
downloadtgif-8250ab0b8c814ce4491b57a52c7d6d95fa01d992.tar.xz
Merge branch 'js/cmake-vs'
Using the CMake support we added some time ago for real with Visual Studio build revealed there were lot of usability improvements possible, which have been carried out. * js/cmake-vs: hashmap_for_each_entry(): workaround MSVC's runtime check failure #3 cmake (Windows): recommend using Visual Studio's built-in CMake support cmake (Windows): initialize vcpkg/build dependencies automatically cmake (Windows): complain when encountering an unknown compiler cmake (Windows): let the `.dll` files be found when running the tests cmake: quote the path accurately when editing `test-lib.sh` cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows cmake: ensure that the `vcpkg` packages are found on Windows cmake: do find Git for Windows' shell interpreter cmake: ignore files generated by CMake as run in Visual Studio
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 800b812c6a..6232d33924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -242,3 +242,4 @@ Release/
/git.VC.VC.opendb
/git.VC.db
*.dSYM
+/contrib/buildsystems/out