Include gtest and gmock headers as user headers instead of system headers.

include/gmock/gmock-actions.h

@@ -43,8 +43,8 @@
 #include <errno.h>
 #endif
 
-#include <gmock/internal/gmock-internal-utils.h>
-#include <gmock/internal/gmock-port.h>
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
 
 namespace testing {
 

include/gmock/gmock-cardinalities.h

@@ -40,8 +40,8 @@
 
 #include <limits.h>
 #include <ostream>  // NOLINT
-#include <gmock/internal/gmock-port.h>
-#include <gtest/gtest.h>
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
 
 namespace testing {
 

include/gmock/gmock-generated-actions.h

@@ -38,8 +38,8 @@
 #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
 #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
 
-#include <gmock/gmock-actions.h>
-#include <gmock/internal/gmock-port.h>
+#include "gmock/gmock-actions.h"
+#include "gmock/internal/gmock-port.h"
 
 namespace testing {
 namespace internal {

include/gmock/gmock-generated-actions.h.pump

@@ -42,8 +42,8 @@ $$}} This meta comment fixes auto-indentation in editors.
 #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
 #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_
 
-#include <gmock/gmock-actions.h>
-#include <gmock/internal/gmock-port.h>
+#include "gmock/gmock-actions.h"
+#include "gmock/internal/gmock-port.h"
 
 namespace testing {
 namespace internal {

include/gmock/gmock-generated-function-mockers.h

@@ -38,8 +38,8 @@
 #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
 #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
 
-#include <gmock/gmock-spec-builders.h>
-#include <gmock/internal/gmock-internal-utils.h>
+#include "gmock/gmock-spec-builders.h"
+#include "gmock/internal/gmock-internal-utils.h"
 
 namespace testing {
 namespace internal {

include/gmock/gmock-generated-function-mockers.h.pump

@@ -41,8 +41,8 @@ $var n = 10  $$ The maximum arity we support.
 #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
 #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_
 
-#include <gmock/gmock-spec-builders.h>
-#include <gmock/internal/gmock-internal-utils.h>
+#include "gmock/gmock-spec-builders.h"
+#include "gmock/internal/gmock-internal-utils.h"
 
 namespace testing {
 namespace internal {

include/gmock/gmock-generated-matchers.h

@@ -41,7 +41,7 @@
 #include <sstream>
 #include <string>
 #include <vector>
-#include <gmock/gmock-matchers.h>
+#include "gmock/gmock-matchers.h"
 
 namespace testing {
 namespace internal {

include/gmock/gmock-generated-matchers.h.pump

@@ -43,7 +43,7 @@ $$ }} This line fixes auto-indentation of the following code in Emacs.
 #include <sstream>
 #include <string>
 #include <vector>
-#include <gmock/gmock-matchers.h>
+#include "gmock/gmock-matchers.h"
 
 namespace testing {
 namespace internal {

include/gmock/gmock-generated-nice-strict.h

@@ -59,8 +59,8 @@
 #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
 #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
 
-#include <gmock/gmock-spec-builders.h>
-#include <gmock/internal/gmock-port.h>
+#include "gmock/gmock-spec-builders.h"
+#include "gmock/internal/gmock-port.h"
 
 namespace testing {
 

include/gmock/gmock-generated-nice-strict.h.pump

@@ -62,8 +62,8 @@ $var n = 10  $$ The maximum arity we support.
 #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
 #define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_NICE_STRICT_H_
 
-#include <gmock/gmock-spec-builders.h>
-#include <gmock/internal/gmock-port.h>
+#include "gmock/gmock-spec-builders.h"
+#include "gmock/internal/gmock-port.h"
 
 namespace testing {
 

include/gmock/gmock-matchers.h

@@ -46,9 +46,9 @@
 #include <utility>
 #include <vector>
 
-#include <gmock/internal/gmock-internal-utils.h>
-#include <gmock/internal/gmock-port.h>
-#include <gtest/gtest.h>
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
 
 namespace testing {
 

include/gmock/gmock-more-actions.h

@@ -36,7 +36,7 @@
 #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
 #define GMOCK_INCLUDE_GMOCK_GMOCK_MORE_ACTIONS_H_
 
-#include <gmock/gmock-generated-actions.h>
+#include "gmock/gmock-generated-actions.h"
 
 namespace testing {
 namespace internal {

include/gmock/gmock-spec-builders.h

@@ -66,12 +66,12 @@
 #include <string>
 #include <vector>
 
-#include <gmock/gmock-actions.h>
-#include <gmock/gmock-cardinalities.h>
-#include <gmock/gmock-matchers.h>
-#include <gmock/internal/gmock-internal-utils.h>
-#include <gmock/internal/gmock-port.h>
-#include <gtest/gtest.h>
+#include "gmock/gmock-actions.h"
+#include "gmock/gmock-cardinalities.h"
+#include "gmock/gmock-matchers.h"
+#include "gmock/internal/gmock-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
 
 namespace testing {
 

include/gmock/gmock.h

@@ -55,15 +55,15 @@
 //
 // where all clauses are optional and WillOnce() can be repeated.
 
-#include <gmock/gmock-actions.h>
-#include <gmock/gmock-cardinalities.h>
-#include <gmock/gmock-generated-actions.h>
-#include <gmock/gmock-generated-function-mockers.h>
-#include <gmock/gmock-generated-matchers.h>
-#include <gmock/gmock-more-actions.h>
-#include <gmock/gmock-generated-nice-strict.h>
-#include <gmock/gmock-matchers.h>
-#include <gmock/internal/gmock-internal-utils.h>
+#include "gmock/gmock-actions.h"
+#include "gmock/gmock-cardinalities.h"
+#include "gmock/gmock-generated-actions.h"
+#include "gmock/gmock-generated-function-mockers.h"
+#include "gmock/gmock-generated-matchers.h"
+#include "gmock/gmock-more-actions.h"
+#include "gmock/gmock-generated-nice-strict.h"
+#include "gmock/gmock-matchers.h"
+#include "gmock/internal/gmock-internal-utils.h"
 
 namespace testing {
 

include/gmock/internal/gmock-generated-internal-utils.h

@@ -39,7 +39,7 @@
 #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
 #define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
 
-#include <gmock/internal/gmock-port.h>
+#include "gmock/internal/gmock-port.h"
 
 namespace testing {
 

include/gmock/internal/gmock-generated-internal-utils.h.pump

@@ -42,7 +42,7 @@ $var n = 10  $$ The maximum arity we support.
 #ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
 #define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_
 
-#include <gmock/internal/gmock-port.h>
+#include "gmock/internal/gmock-port.h"
 
 namespace testing {
 

include/gmock/internal/gmock-internal-utils.h

@@ -42,9 +42,9 @@
 #include <ostream>  // NOLINT
 #include <string>
 
-#include <gmock/internal/gmock-generated-internal-utils.h>
-#include <gmock/internal/gmock-port.h>
-#include <gtest/gtest.h>
+#include "gmock/internal/gmock-generated-internal-utils.h"
+#include "gmock/internal/gmock-port.h"
+#include "gtest/gtest.h"
 
 namespace testing {
 namespace internal {

include/gmock/internal/gmock-port.h

@@ -42,8 +42,8 @@
 
 // Most of the types needed for porting Google Mock are also required
 // for Google Test and are defined in gtest-port.h.
-#include <gtest/internal/gtest-linked_ptr.h>
-#include <gtest/internal/gtest-port.h>
+#include "gtest/internal/gtest-linked_ptr.h"
+#include "gtest/internal/gtest-port.h"
 
 // To avoid conditional compilation everywhere, we make it
 // gmock-port.h's responsibility to #include the header implementing

scripts/fuse_gmock_files.py

@@ -75,8 +75,8 @@ sys.path.append(os.path.join(DEFAULT_GMOCK_ROOT_DIR, 'gtest/scripts'))
 import fuse_gtest_files
 gtest = fuse_gtest_files
 
-# Regex for matching '#include <gmock/...>'.
-INCLUDE_GMOCK_FILE_REGEX = re.compile(r'^\s*#\s*include\s*<(gmock/.+)>')
+# Regex for matching '#include "gmock/..."'.
+INCLUDE_GMOCK_FILE_REGEX = re.compile(r'^\s*#\s*include\s*"(gmock/.+)"')
 
 # Where to find the source seed files.
 GMOCK_H_SEED = 'include/gmock/gmock.h'
@@ -135,19 +135,19 @@ def FuseGMockH(gmock_root, output_dir):
     for line in file(os.path.join(gmock_root, gmock_header_path), 'r'):
       m = INCLUDE_GMOCK_FILE_REGEX.match(line)
       if m:
-        # It's '#include <gmock/...>' - let's process it recursively.
+        # It's '#include "gmock/..."' - let's process it recursively.
         ProcessFile('include/' + m.group(1))
       else:
         m = gtest.INCLUDE_GTEST_FILE_REGEX.match(line)
         if m:
-          # It's '#include <gtest/foo.h>'.  We translate it to
-          # <gtest/gtest.h>, regardless of what foo is, since all
+          # It's '#include "gtest/foo.h"'.  We translate it to
+          # "gtest/gtest.h", regardless of what foo is, since all
           # gtest headers are fused into gtest/gtest.h.
 
           # There is no need to #include gtest.h twice.
           if not gtest.GTEST_H_SEED in processed_files:
             processed_files.add(gtest.GTEST_H_SEED)
-            output_file.write('#include <%s>\n' % (gtest.GTEST_H_OUTPUT,))
+            output_file.write('#include "%s"\n' % (gtest.GTEST_H_OUTPUT,))
         else:
           # Otherwise we copy the line unchanged to the output file.
           output_file.write(line)
@@ -174,18 +174,18 @@ def FuseGMockAllCcToFile(gmock_root, output_file):
     for line in file(os.path.join(gmock_root, gmock_source_file), 'r'):
       m = INCLUDE_GMOCK_FILE_REGEX.match(line)
       if m:
-        # It's '#include <gmock/foo.h>'.  We treat it as '#include
-        # <gmock/gmock.h>', as all other gmock headers are being fused
+        # It's '#include "gmock/foo.h"'.  We treat it as '#include
+        # "gmock/gmock.h"', as all other gmock headers are being fused
         # into gmock.h and cannot be #included directly.
 
-        # There is no need to #include <gmock/gmock.h> more than once.
+        # There is no need to #include "gmock/gmock.h" more than once.
         if not GMOCK_H_SEED in processed_files:
           processed_files.add(GMOCK_H_SEED)
-          output_file.write('#include <%s>\n' % (GMOCK_H_OUTPUT,))
+          output_file.write('#include "%s"\n' % (GMOCK_H_OUTPUT,))
       else:
         m = gtest.INCLUDE_GTEST_FILE_REGEX.match(line)
         if m:
-          # It's '#include <gtest/...>'.
+          # It's '#include "gtest/..."'.
           # There is no need to #include gtest.h as it has been
           # #included by gtest-all.cc.
           pass

src/gmock-all.cc

@@ -37,7 +37,7 @@
 
 // This line ensures that gmock.h can be compiled on its own, even
 // when it's fused.
-#include <gmock/gmock.h>
+#include "gmock/gmock.h"
 
 // The following lines pull in the real gmock *.cc files.
 #include "src/gmock-cardinalities.cc"