diff options
author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-25 10:58:09 -0700 |
---|---|---|
committer | Dmitry Kovalev <dkovalev@google.com> | 2013-10-25 10:58:09 -0700 |
commit | 9f528ce057e0945abd8382f551119dc2e20bfcc5 (patch) | |
tree | 59f6a807c4e61399b54803a7bc42f089cb724969 /third_party/googletest/src/README | |
parent | 47665452f0da3c11427ecb4852535e1787bb0c5b (diff) | |
download | libvpx-9f528ce057e0945abd8382f551119dc2e20bfcc5.tar libvpx-9f528ce057e0945abd8382f551119dc2e20bfcc5.tar.gz libvpx-9f528ce057e0945abd8382f551119dc2e20bfcc5.tar.bz2 libvpx-9f528ce057e0945abd8382f551119dc2e20bfcc5.zip |
Updating gtest from 1.6.0 to 1.7.0.
This is required in order to build libvpx on OS X Mavericks where gcc
compiler is deleted, clang (3.3) is the default now.
Using unmodified source files from gtest-1.7.0/fused-src folder.
Change-Id: I3d5f7278149c904e48737327daf7097a8bb0b390
Diffstat (limited to 'third_party/googletest/src/README')
-rw-r--r-- | third_party/googletest/src/README | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/third_party/googletest/src/README b/third_party/googletest/src/README index 51a9376db..26f35a847 100644 --- a/third_party/googletest/src/README +++ b/third_party/googletest/src/README @@ -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 @@ -217,6 +218,16 @@ default build location. See the "xcodebuild" man page for more information about building different configurations and building in different locations. +If you wish to use the Google Test Xcode project with Xcode 4.x and +above, you need to either: + * update the SDK configuration options in xcode/Config/General.xconfig. + Comment options SDKROOT, MACOS_DEPLOYMENT_TARGET, and GCC_VERSION. If + you choose this route you lose the ability to target earlier versions + of MacOS X. + * Install an SDK for an earlier version. This doesn't appear to be + supported by Apple, but has been reported to work + (http://stackoverflow.com/questions/5378518). + Tweaking Google Test -------------------- |