summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2013-02-27 17:49:18 (GMT)
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2013-02-27 17:49:18 (GMT)
commitb854938bd06bb0c38ed9fd076bcacdbfe2bd8c31 (patch)
tree814b29ae9b565a068ccf70131a8ffe296d9313fc /make
parentba072ccca41212e3ac3ac1eca3381d226187c0d1 (diff)
downloadgoogletest-b854938bd06bb0c38ed9fd076bcacdbfe2bd8c31.zip
googletest-b854938bd06bb0c38ed9fd076bcacdbfe2bd8c31.tar.gz
googletest-b854938bd06bb0c38ed9fd076bcacdbfe2bd8c31.tar.bz2
Adds -pthread and changes -I to -isystem in gtest's build instructions.
Diffstat (limited to 'make')
-rw-r--r--make/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/make/Makefile b/make/Makefile
index 5b27b6a..9ac7449 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -20,10 +20,12 @@ GTEST_DIR = ..
USER_DIR = ../samples
# Flags passed to the preprocessor.
-CPPFLAGS += -I$(GTEST_DIR)/include
+# Set Google Test's header directory as a system directory, such that
+# the compiler doesn't generate warnings in Google Test headers.
+CPPFLAGS += -isystem $(GTEST_DIR)/include
# Flags passed to the C++ compiler.
-CXXFLAGS += -g -Wall -Wextra
+CXXFLAGS += -g -Wall -Wextra -pthread
# All tests produced by this Makefile. Remember to add new tests you
# created to the list.