summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore26
-rw-r--r--library.json6
2 files changed, 29 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 3794794..6209bf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,29 @@ googlemock/CTestTestfile.cmake
googlemock/Makefile
googlemock/cmake_install.cmake
googlemock/gtest
+/bin
+/googlemock/gmock.dir
+/googlemock/gmock_main.dir
+/googlemock/RUN_TESTS.vcxproj.filters
+/googlemock/RUN_TESTS.vcxproj
+/googlemock/INSTALL.vcxproj.filters
+/googlemock/INSTALL.vcxproj
+/googlemock/gmock_main.vcxproj.filters
+/googlemock/gmock_main.vcxproj
+/googlemock/gmock.vcxproj.filters
+/googlemock/gmock.vcxproj
+/googlemock/gmock.sln
+/googlemock/ALL_BUILD.vcxproj.filters
+/googlemock/ALL_BUILD.vcxproj
+/lib
+/Win32
+/ZERO_CHECK.vcxproj.filters
+/ZERO_CHECK.vcxproj
+/RUN_TESTS.vcxproj.filters
+/RUN_TESTS.vcxproj
+/INSTALL.vcxproj.filters
+/INSTALL.vcxproj
+/googletest-distribution.sln
+/CMakeCache.txt
+/ALL_BUILD.vcxproj.filters
+/ALL_BUILD.vcxproj
diff --git a/library.json b/library.json
index 6fb64e8..84c2b8c 100644
--- a/library.json
+++ b/library.json
@@ -27,23 +27,23 @@
"googlemock/make",
"googlemock/msvc",
"googlemock/scripts",
+ "googlemock/src/gmock_main.cc",
"googlemock/test",
"googlemock/CMakeLists.txt",
"googlemock/Makefile.am",
"googlemock/configure.ac",
- "googlemock/src/gmock_main.cc",
"googletest/cmake",
"googletest/codegear",
"googletest/m4",
"googletest/make",
"googletest/msvc",
"googletest/scripts",
+ "googletest/src/gtest_main.cc",
"googletest/test",
"googletest/xcode",
"googletest/CMakeLists.txt",
"googletest/Makefile.am",
- "googletest/configure.ac",
- "googletest/src/gtest_main.cc"
+ "googletest/configure.ac"
]
},
"build": {