diff options
| author | Kevin Wojniak <kainjow@users.noreply.github.com> | 2019-07-01 11:07:45 -0700 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2019-07-01 14:07:45 -0400 |
| commit | a392566e9b31edfb3f3da9bb09dc193215c285c2 (patch) | |
| tree | 458b19f71b31758494e866993b966fc1a7e77d33 /test/cpp | |
| parent | 3711d9081095551c04980d328a2e4729d9730219 (diff) | |
| download | thrift-a392566e9b31edfb3f3da9bb09dc193215c285c2.tar.gz | |
THRIFT-4896 - prevent cpp and c_glib include directories from leaking into other targets (#1821)
- enable the automake `nostdinc` option
- fix up include paths
Diffstat (limited to 'test/cpp')
| -rwxr-xr-x | test/cpp/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/Makefile.am b/test/cpp/Makefile.am index ebe715eef..76ae82bfb 100755 --- a/test/cpp/Makefile.am +++ b/test/cpp/Makefile.am @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -AUTOMAKE_OPTIONS = subdir-objects serial-tests +AUTOMAKE_OPTIONS = subdir-objects serial-tests nostdinc BUILT_SOURCES = gen-cpp/ThriftTest.cpp \ gen-cpp/ThriftTest_types.cpp \ @@ -108,7 +108,7 @@ gen-cpp/ThriftTest.cpp gen-cpp/ThriftTest_types.cpp gen-cpp/ThriftTest_constants gen-cpp/StressTest_types.cpp gen-cpp/StressTest_constants.cpp gen-cpp/Service.cpp: $(top_srcdir)/test/StressTest.thrift $(THRIFT) $(THRIFT) --gen cpp $< -AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp +AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(LIBEVENT_CPPFLAGS) -I$(top_srcdir)/lib/cpp/src -Igen-cpp -I. AM_CXXFLAGS = -Wall -Wextra -pedantic -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS AM_LDFLAGS = $(BOOST_LDFLAGS) $(LIBEVENT_LDFLAGS) $(ZLIB_LIBS) |