aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorCarlos O'Ryan <coryan@users.noreply.github.com>2018-03-26 16:54:32 -0400
committerFeng Xiao <xfxyjwf@gmail.com>2018-03-26 13:54:32 -0700
commit3c5442a95d9608519a76a5db27d21d71dd1137a1 (patch)
tree4dd687999accb76c0bf65fc2178724c5653f1c61 /.gitignore
parent1156ee7ea73b768bc52f1a42dfcc42120291e268 (diff)
downloadprotobuf-3c5442a95d9608519a76a5db27d21d71dd1137a1.tar.gz
protobuf-3c5442a95d9608519a76a5db27d21d71dd1137a1.tar.bz2
protobuf-3c5442a95d9608519a76a5db27d21d71dd1137a1.zip
Include googletest as a submodule (#3993)
Add googletest as a submodule in third_party/googletest.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore10
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index af88e226..0efa2145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ m4/lt~obsolete.m4
autom4te.cache
# downloaded files
-gmock
+./gmock
# in-tree configure-generated files
Makefile
@@ -180,3 +180,11 @@ ruby/Gemfile.lock
ruby/compatibility_tests/v3.0.0/protoc
ruby/compatibility_tests/v3.0.0/tests/generated_code_pb.rb
ruby/compatibility_tests/v3.0.0/tests/test_import_pb.rb
+
+# IntelliJ CLion Config files and build output
+cmake/.idea
+cmake/cmake-build-debug/
+
+# Common build subdirectories.
+./.build/
+./_build/