summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-08-17 15:48:56 (GMT)
committerGitHub <noreply@github.com>2018-08-17 15:48:56 (GMT)
commita9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d (patch)
tree32d0dac55ff598f9732ff57581044eabd24fa807 /.gitignore
parent421e7b4f29fc761c66d2773a1fc318a738a6d3da (diff)
parent02a8ca87735601466d8c564344f9be493da84708 (diff)
downloadgoogletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.zip
googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.tar.gz
googletest-a9bd428e72a11a3a36bb7a8755cf2d58b1ce8e9d.tar.bz2
Merge branch 'master' into fix-msvc-d9025-warningrefs/pull/1612/head
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore14
1 files changed, 14 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b294d3b..73cdd2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,17 @@ googletest/m4/lt~obsolete.m4
# Ignore generated directories.
googlemock/fused-src/
googletest/fused-src/
+
+# macOS files
+.DS_Store
+
+# Ignore cmake generated directories and files.
+CMakeFiles
+CTestTestfile.cmake
+Makefile
+cmake_install.cmake
+googlemock/CMakeFiles
+googlemock/CTestTestfile.cmake
+googlemock/Makefile
+googlemock/cmake_install.cmake
+googlemock/gtest