diff options
author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-02-27 17:49:18 (GMT) |
---|---|---|
committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-02-27 17:49:18 (GMT) |
commit | b854938bd06bb0c38ed9fd076bcacdbfe2bd8c31 (patch) | |
tree | 814b29ae9b565a068ccf70131a8ffe296d9313fc | |
parent | ba072ccca41212e3ac3ac1eca3381d226187c0d1 (diff) | |
download | googletest-b854938bd06bb0c38ed9fd076bcacdbfe2bd8c31.zip googletest-b854938bd06bb0c38ed9fd076bcacdbfe2bd8c31.tar.gz googletest-b854938bd06bb0c38ed9fd076bcacdbfe2bd8c31.tar.bz2 |
Adds -pthread and changes -I to -isystem in gtest's build instructions.
-rw-r--r-- | README | 19 | ||||
-rw-r--r-- | make/Makefile | 6 |
2 files changed, 14 insertions, 11 deletions
@@ -119,21 +119,22 @@ and Xcode) to compile ${GTEST_DIR}/src/gtest-all.cc -with - - ${GTEST_DIR}/include and ${GTEST_DIR} - -in the header search path. Assuming a Linux-like system and gcc, +with ${GTEST_DIR}/include in the system header search path and ${GTEST_DIR} +in the normal header search path. Assuming a Linux-like system and gcc, something like the following will do: - g++ -I${GTEST_DIR}/include -I${GTEST_DIR} -c ${GTEST_DIR}/src/gtest-all.cc + g++ -isystem ${GTEST_DIR}/include -I${GTEST_DIR} \ + -pthread -c ${GTEST_DIR}/src/gtest-all.cc ar -rv libgtest.a gtest-all.o +(We need -pthread as Google Test uses threads.) + Next, you should compile your test source file with -${GTEST_DIR}/include in the header search path, and link it with gtest -and any other necessary libraries: +${GTEST_DIR}/include in the system header search path, and link it +with gtest and any other necessary libraries: - g++ -I${GTEST_DIR}/include path/to/your_test.cc libgtest.a -o your_test + g++ -isystem ${GTEST_DIR}/include -pthread path/to/your_test.cc libgtest.a \ + -o your_test As an example, the make/ directory contains a Makefile that you can use to build Google Test on systems where GNU make is available 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. |