diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-02-27 17:49:18 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-02-27 17:49:18 +0000 |
| commit | b4dbe2896c589928ec0b5a65eff1c58283da1038 (patch) | |
| tree | 814b29ae9b565a068ccf70131a8ffe296d9313fc /make | |
| parent | a032cfff4091c87a137a8d24ce2eb97c740cf4c8 (diff) | |
| download | gtest-b4dbe2896c589928ec0b5a65eff1c58283da1038.tar.gz gtest-b4dbe2896c589928ec0b5a65eff1c58283da1038.tar.bz2 gtest-b4dbe2896c589928ec0b5a65eff1c58283da1038.tar.xz | |
Adds -pthread and changes -I to -isystem in gtest's build instructions.
git-svn-id: http://googletest.googlecode.com/svn/trunk@638 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 6 |
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. |