got rid of all the absolute paths in the fitpc code
Previously, there were 2 places (BinaryLogReader and the HTTP file server) that
had "/home/driver/" hard coded. I changed both of those to use paths relative to
the location of the executable (retrieved from /proc/self/exe).
git-svn-id: https://robotics.mvla.net/svn/frc971/2013/trunk/src@4162 f308d9b7-e957-4cde-b6ac-9a88185e7312
diff --git a/aos/build/externals.gyp b/aos/build/externals.gyp
index 2ed0478..796fdeb 100644
--- a/aos/build/externals.gyp
+++ b/aos/build/externals.gyp
@@ -81,11 +81,30 @@
},
},
{
+# Dependents should only use the "gtest/gtest_prod.h" header.
+# This target is NOT the correct one for "aos/common/gtest_prod.h". That one is
+# aos/common/common.gyp:gtest_prod. This target just deals with setting up to
+# use the gtest header.
+ 'target_name': 'gtest_prod',
+ 'type': 'static_library',
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(externals)/gtest-<(gtest_version)/include'
+ ],
+ },
+ },
+ {
'target_name': 'gtest',
'type': 'static_library',
'sources': [
'<(externals)/gtest-<(gtest_version)/fused-src/gtest/gtest-all.cc',
],
+ 'dependencies': [
+ 'gtest_prod',
+ ],
+ 'export_dependent_settings': [
+ 'gtest_prod',
+ ],
'conditions': [['OS=="crio"', {
'defines': [
'GTEST_HAS_TR1_TUPLE=0',
@@ -104,10 +123,6 @@
'<(externals)/gtest-<(gtest_version)/fused-src/gtest/gtest_main.cc',
],
}]],
- 'include_dirs': [
- '<(externals)/gtest-<(gtest_version)',
- '<(externals)/gtest-<(gtest_version)/include'
- ],
'cflags!': ['-Werror'],
'direct_dependent_settings': {
'include_dirs': ['<(externals)/gtest-<(gtest_version)/include'],