Merge branch 'master' into master

8304d061 · Daniel Krügler · GitHub · b11b2e40 · 675686a1 · 8304d061
Commit 8304d061 authored Aug 21, 2017 by Daniel Krügler Committed by GitHub Aug 21, 2017
20 changed files
--- a/googletest/cmake/gtest_main.pc.in
+++ b/googletest/cmake/gtest_main.pc.in
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+Name: gtest_main
+Description: GoogleTest (with main() function)
+Version: @PROJECT_VERSION@
+URL: https://github.com/google/googletest
+Requires: gtest
+Libs: -L${libdir} -lgtest_main @CMAKE_THREAD_LIBS_INIT@
+Cflags: -I${includedir} @GTEST_HAS_PTHREAD_MACRO@ @CMAKE_THREAD_LIBS_INIT@
--- a/googletest/cmake/internal_utils.cmake
+++ b/googletest/cmake/internal_utils.cmake
--- a/googletest/docs/AdvancedGuide.md
+++ b/googletest/docs/AdvancedGuide.md
--- a/googletest/docs/DevGuide.md
+++ b/googletest/docs/DevGuide.md
--- a/googletest/docs/Documentation.md
+++ b/googletest/docs/Documentation.md
--- a/googletest/docs/FAQ.md
+++ b/googletest/docs/FAQ.md
--- a/googletest/docs/Pkgconfig.md
+++ b/googletest/docs/Pkgconfig.md
--- a/googletest/docs/Primer.md
+++ b/googletest/docs/Primer.md
--- a/googletest/docs/PumpManual.md
+++ b/googletest/docs/PumpManual.md
--- a/googletest/docs/V1_5_AdvancedGuide.md
+++ b/googletest/docs/V1_5_AdvancedGuide.md
--- a/googletest/docs/V1_5_Documentation.md
+++ b/googletest/docs/V1_5_Documentation.md
--- a/googletest/docs/V1_5_FAQ.md
+++ b/googletest/docs/V1_5_FAQ.md
--- a/googletest/docs/V1_5_Primer.md
+++ b/googletest/docs/V1_5_Primer.md
--- a/googletest/docs/V1_5_PumpManual.md
+++ b/googletest/docs/V1_5_PumpManual.md
--- a/googletest/docs/V1_5_XcodeGuide.md
+++ b/googletest/docs/V1_5_XcodeGuide.md
--- a/googletest/docs/V1_6_AdvancedGuide.md
+++ b/googletest/docs/V1_6_AdvancedGuide.md
--- a/googletest/docs/V1_6_Documentation.md
+++ b/googletest/docs/V1_6_Documentation.md
--- a/googletest/docs/V1_6_FAQ.md
+++ b/googletest/docs/V1_6_FAQ.md
--- a/googletest/docs/V1_6_Primer.md
+++ b/googletest/docs/V1_6_Primer.md
--- a/googletest/docs/V1_6_PumpManual.md
+++ b/googletest/docs/V1_6_PumpManual.md