Merge pull request grpc#7762 from KindDragon/master

Fix CMake for windows (VS2015)
rowillia · Aug 18, 2016 · 6cfc80e · 6cfc80e
2 parents f906e55 + 407dc4f
commit 6cfc80e
Show file tree

Hide file tree

Showing 4 changed files with 197 additions and 113 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 # C/C++ build outputs
+.build/
 bins
 gens
 libs
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     # C/C++ build outputs
+    .build/
     bins
     gens
     libs
@@ Expand Down @@