Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2337)

Unified Diff: build_tools/install_gtest/nacl-gtest-1.5.0.patch

Issue 6635045: Updates to make install_third_party build gtest and gmock on windows. Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build_tools/install_gtest/nacl-gmock-1.5.0.patch ('k') | build_tools/install_third_party.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_tools/install_gtest/nacl-gtest-1.5.0.patch
===================================================================
--- build_tools/install_gtest/nacl-gtest-1.5.0.patch (revision 760)
+++ build_tools/install_gtest/nacl-gtest-1.5.0.patch (working copy)
@@ -1,7 +1,7 @@
diff -Naur gtest-1.5.0/Makefile gtest-1.5.0.nacl/Makefile
--- gtest-1.5.0/Makefile 1969-12-31 17:00:00.000000000 -0700
+++ gtest-1.5.0.nacl/Makefile 2010-07-08 09:49:37.000000000 -0600
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,32 @@
+CXXFLAGS = -O0 -g
+INCLUDE = -Iinclude -I.
+LIB_GTEST = libgtest.a
@@ -13,6 +13,13 @@
+ gtest-test-part.o \
+ gtest-typed-test.o
+
++# Necessary because we can't CD to the obj directory on windows.
++OBJ_LIST = $(OBJ_DIR)/gtest.o \
++ $(OBJ_DIR)/gtest-filepath.o \
++ $(OBJ_DIR)/gtest-port.o \
++ $(OBJ_DIR)/gtest-test-part.o \
++ $(OBJ_DIR)/gtest-typed-test.o
++
+all: $(LIB_GTEST)
+ @echo "Making libgtest"
+
@@ -26,13 +33,13 @@
+ $(CXX) -c $(INCLUDE) $(CXXFLAGS) $< -o $(OBJ_DIR)/$@
+
+$(LIB_GTEST): $(OBJ_DIR) $(OBJ_FILES)
-+ cd $(OBJ_DIR) && $(AR) rcs ../$(LIB_GTEST) $(OBJ_FILES)
++ $(AR) rcs $(LIB_GTEST) $(OBJ_LIST)
diff -Naur gtest-1.5.0/include/gtest/gtest.h gtest-1.5.0.nacl/include/gtest/gtest.h
--- gtest-1.5.0/include/gtest/gtest.h 2010-04-15 16:02:03.000000000 -0600
+++ gtest-1.5.0.nacl/include/gtest/gtest.h 2010-07-08 09:49:37.000000000 -0600
@@ -56,7 +56,6 @@
-
- #include <gtest/internal/gtest-internal.h>
+ #include <gtest/internal/gtest-internal.h>ls
+
#include <gtest/internal/gtest-string.h>
-#include <gtest/gtest-death-test.h>
#include <gtest/gtest-message.h>
« no previous file with comments | « build_tools/install_gtest/nacl-gmock-1.5.0.patch ('k') | build_tools/install_third_party.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698