diff options
| author | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-10-12 01:07:26 (GMT) |
|---|---|---|
| committer | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-10-12 01:07:26 (GMT) |
| commit | 321234377e38da6548721408d284ab4be08cb630 (patch) | |
| tree | 7e11a3a0fc9aea01fea5f61d762e28a2934df762 | |
| parent | e0865dd9199e8fffd5c2f95a68de6c1851f77c15 (diff) | |
| download | googletest-321234377e38da6548721408d284ab4be08cb630.zip googletest-321234377e38da6548721408d284ab4be08cb630.tar.gz googletest-321234377e38da6548721408d284ab4be08cb630.tar.bz2 | |
Fixes the header search path in SConscript and add SConscript to the distribution.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | scons/SConscript | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index fba0c26..2df9b51 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,7 @@ EXTRA_DIST = \ CHANGES \ CONTRIBUTORS \ include/gtest/internal/gtest-type-util.h.pump \ + scons/SConscript \ scripts/gen_gtest_pred_impl.py \ src/gtest-all.cc diff --git a/scons/SConscript b/scons/SConscript index 3fcda15..8c2f9e4 100644 --- a/scons/SConscript +++ b/scons/SConscript @@ -96,10 +96,11 @@ __author__ = 'joi@google.com (Joi Sigurdsson)' Import('env') env = env.Clone() -# Include paths to gtest headers are relative to a directory two above -# the gtest directory itself, and this SConscript file is one -# directory deeper than the gtest directory. -env.Prepend(CPPPATH = ['../../..']) +# Include paths to gtest headers are relative to either the gtest +# directory or the 'include' subdirectory of it, and this SConscript +# file is one directory deeper than the gtest directory. +env.Prepend(CPPPATH = ['..', + '../include']) # TODO(joi@google.com) Fix the code that causes this warning so that # we see all warnings from the compiler about possible 64-bit porting |