fixed and actually used the gtest patch
I don't think it ever worked...
diff --git a/aos/build/download_externals.sh b/aos/build/download_externals.sh
index 3291088..e643107 100755
--- a/aos/build/download_externals.sh
+++ b/aos/build/download_externals.sh
@@ -66,7 +66,7 @@
# get gtest
GTEST_VERSION=1.6.0
-GTEST_DIR=${EXTERNALS}/gtest-${GTEST_VERSION}-p1
+GTEST_DIR=${EXTERNALS}/gtest-${GTEST_VERSION}-p2
GTEST_ZIP=${EXTERNALS}/gtest-${GTEST_VERSION}.zip
[ -f ${GTEST_ZIP} ] || wget http://googletest.googlecode.com/files/gtest-${GTEST_VERSION}.zip -O ${GTEST_ZIP}
[ -d ${GTEST_DIR} ] || ( unzip ${GTEST_ZIP} -d ${TMPDIR} && mv ${TMPDIR}/gtest-${GTEST_VERSION} ${GTEST_DIR} && cd ${GTEST_DIR} && patch -p1 < ${AOS}/externals/gtest.patch )
diff --git a/aos/build/externals.gyp b/aos/build/externals.gyp
index 2b82e38..27c2512 100644
--- a/aos/build/externals.gyp
+++ b/aos/build/externals.gyp
@@ -10,7 +10,7 @@
# These versions have to be kept in sync with the ones in download_externals.sh.
'eigen_version': '3.2.1',
- 'gtest_version': '1.6.0-p1',
+ 'gtest_version': '1.6.0-p2',
'ctemplate_version': '129',
'gflags_version': '2.0',
'compiler_rt_version': 'RELEASE_32_final',
@@ -123,7 +123,11 @@
'target_name': 'gtest',
'type': 'static_library',
'sources': [
- '<(externals)/gtest-<(gtest_version)/fused-src/gtest/gtest-all.cc',
+ '<(externals)/gtest-<(gtest_version)/src/gtest-all.cc',
+ '<(externals)/gtest-<(gtest_version)/fused-src/gtest/gtest_main.cc',
+ ],
+ 'include_dirs': [
+ '<(externals)/gtest-<(gtest_version)',
],
'dependencies': [
'gtest_prod',
@@ -131,24 +135,6 @@
'export_dependent_settings': [
'gtest_prod',
],
- 'conditions': [['PLATFORM=="crio"', {
- 'defines': [
- 'GTEST_HAS_TR1_TUPLE=0',
- 'GTEST_HAS_STREAM_REDIRECTION=0',
- 'GTEST_HAS_POSIX_RE=0', # it only has a broken header...
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'GTEST_HAS_TR1_TUPLE=0',
- 'GTEST_HAS_STREAM_REDIRECTION=0',
- 'GTEST_HAS_POSIX_RE=0',
- ],
- },
- }, {
- 'sources': [
- '<(externals)/gtest-<(gtest_version)/fused-src/gtest/gtest_main.cc',
- ],
- }]],
'cflags!': ['-Werror'],
'direct_dependent_settings': {
'include_dirs': ['<(externals)/gtest-<(gtest_version)/include'],