diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2013-02-27 17:53:45 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2013-02-27 17:53:45 +0000 |
| commit | cf40604cf087eb2a616f104fac587bd889b24e5d (patch) | |
| tree | 37b79e63201771198ef81f3669bff5a8f20eb217 /make | |
| parent | 40fa8ffc9e46cc779fc252ce2bb5aab76faf59a0 (diff) | |
| download | googletest-cf40604cf087eb2a616f104fac587bd889b24e5d.tar.gz googletest-cf40604cf087eb2a616f104fac587bd889b24e5d.tar.bz2 googletest-cf40604cf087eb2a616f104fac587bd889b24e5d.zip | |
Adds -pthread and switches -I to -isystem in build instructions;
also pulls in the latest gtest revision (r638).
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/make/Makefile b/make/Makefile index 6386e5b2..c1cc0e90 100644 --- a/make/Makefile +++ b/make/Makefile @@ -27,10 +27,13 @@ GMOCK_DIR = .. USER_DIR = ../test # Flags passed to the preprocessor. -CPPFLAGS += -I$(GTEST_DIR)/include -I$(GMOCK_DIR)/include +# Set Google Test and Google Mock's header directories as system +# directories, such that the compiler doesn't generate warnings in +# these headers. +CPPFLAGS += -isystem $(GTEST_DIR)/include -isystem $(GMOCK_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. |