merge

googlemock/CMakeLists.txt

@@ -15,7 +15,7 @@ option(gmock_build_tests "Build all of Google Mock's own tests." OFF)
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt")
   set(gtest_dir gtest)
 else()
-  set(gtest_dir ../gtest)
+  set(gtest_dir ../googletest)
 endif()
 
 # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().

googlemock/scripts/gmock_doctor.py

@@ -599,7 +599,7 @@ def main():
     print ('Please copy and paste the compiler errors here.  Press c-D when '
            'you are done:')
   else:
-    print 'Waiting for compiler errors on stdin . . .'
+    print ('Waiting for compiler errors on stdin . . .')
 
   msg = sys.stdin.read().strip()
   diagnoses = Diagnose(msg)
@@ -617,18 +617,18 @@ If you send your source code and the compiler's error messages to
 %s, you can be helped and I can get smarter --
 win-win for us!""" % (msg, _EMAIL))
   else:
-    print '------------------------------------------------------------'
-    print 'Your code appears to have the following',
+    print ('------------------------------------------------------------')
+    print ('Your code appears to have the following',)
     if count > 1:
-      print '%s diseases:' % (count,)
+      print ('%s diseases:' % (count,))
     else:
-      print 'disease:'
+      print ('disease:')
     i = 0
     for d in diagnoses:
       i += 1
       if count > 1:
-        print '\n#%s:' % (i,)
-      print d
+        print ('\n#%s:' % (i,))
+      print (d)
     print ("""
 How did I do?  If you think I'm wrong or unhelpful, please send your
 source code and the compiler's error messages to %s.