generic-library/breakpad
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add top_srcdir/src to CPPFLAGS for all unittests to fix compilation of unittests when configuring outside the srcdir

Browse Source 
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@701 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
ted.mielczarek 2010-09-29 14:02:09 +00:00
parent 8d1130a89e
commit 82a0188946
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile.am
View File

@ -136,8 +136,8 @@ src_libbreakpad_la_SOURCES = \
src/processor/stackwalker_x86.h \
src/processor/static_map_iterator-inl.h \
src/processor/static_map_iterator.h \
src/processor/static_map-inl.h \
src/processor/static_map.h \
src/processor/static_map-inl.h \
src/processor/static_map.h \
src/processor/tokenize.cc \
src/processor/tokenize.h \
src/processor/udp_network.cc \
@ -214,6 +214,7 @@ src_client_linux_linux_client_unittest_SOURCES = \
src/testing/src/gmock-all.cc
src_client_linux_linux_client_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -248,6 +249,7 @@ src_processor_binarystream_unittest_SOURCES = \
src/testing/gtest/src/gtest-all.cc \
src/testing/src/gmock-all.cc
src_processor_binarystream_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -260,6 +262,7 @@ src_processor_basic_source_line_resolver_unittest_SOURCES = \
src/testing/gtest/src/gtest-all.cc \
src/testing/src/gmock-all.cc
src_processor_basic_source_line_resolver_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -281,6 +284,7 @@ src_processor_cfi_frame_info_unittest_LDADD = \
src/processor/logging.lo \
src/processor/pathname_stripper.lo
src_processor_cfi_frame_info_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -297,6 +301,7 @@ src_processor_minidump_processor_unittest_SOURCES = \
src/testing/gtest/src/gtest-all.cc \
src/testing/src/gmock-all.cc
src_processor_minidump_processor_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -329,6 +334,7 @@ src_processor_minidump_unittest_SOURCES = \
src/testing/gtest/src/gtest_main.cc \
src/testing/src/gmock-all.cc
src_processor_minidump_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -344,6 +350,7 @@ src_processor_network_source_line_resolver_unittest_SOURCES = \
src/testing/gtest/src/gtest-all.cc \
src/testing/src/gmock-all.cc
src_processor_network_source_line_resolver_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -363,6 +370,7 @@ src_processor_network_source_line_resolver_server_unittest_SOURCES = \
src/testing/gtest/src/gtest-all.cc \
src/testing/src/gmock-all.cc
src_processor_network_source_line_resolver_server_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -397,6 +405,7 @@ src_processor_network_source_line_server_unittest_SOURCES = \
src/testing/gtest/src/gtest-all.cc \
src/testing/src/gmock-all.cc
src_processor_network_source_line_server_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -414,8 +423,9 @@ src_processor_static_map_unittest_SOURCES = \
src/testing/gtest/src/gtest-all.cc \
src/testing/src/gmock-all.cc
src_processor_static_map_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
-I$(top_srcdir)/src/testing
src_processor_static_map_unittest_LDADD = \
@ -467,6 +477,7 @@ src_processor_stackwalker_amd64_unittest_SOURCES = \
src_processor_stackwalker_amd64_unittest_LDADD = \
src/libbreakpad.la
src_processor_stackwalker_amd64_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -481,6 +492,7 @@ src_processor_stackwalker_arm_unittest_SOURCES = \
src_processor_stackwalker_arm_unittest_LDADD = \
src/libbreakpad.la
src_processor_stackwalker_arm_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -495,6 +507,7 @@ src_processor_stackwalker_x86_unittest_SOURCES = \
src_processor_stackwalker_x86_unittest_LDADD = \
src/libbreakpad.la
src_processor_stackwalker_x86_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -510,6 +523,7 @@ src_processor_synth_minidump_unittest_SOURCES = \
src/processor/synth_minidump.cc \
src/processor/synth_minidump.h
src_processor_synth_minidump_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -523,6 +537,7 @@ src_common_test_assembler_unittest_SOURCES = \
src/testing/gtest/src/gtest_main.cc \
src/testing/src/gmock-all.cc
src_common_test_assembler_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \

21
Makefile.in
View File

@ -777,8 +777,8 @@ src_libbreakpad_la_SOURCES = \
src/processor/stackwalker_x86.h \
src/processor/static_map_iterator-inl.h \
src/processor/static_map_iterator.h \
src/processor/static_map-inl.h \
src/processor/static_map.h \
src/processor/static_map-inl.h \
src/processor/static_map.h \
src/processor/tokenize.cc \
src/processor/tokenize.h \
src/processor/udp_network.cc \
@ -809,6 +809,7 @@ TESTS_ENVIRONMENT =
@LINUX_HOST_TRUE@ src/testing/src/gmock-all.cc
@LINUX_HOST_TRUE@src_client_linux_linux_client_unittest_CPPFLAGS = \
@LINUX_HOST_TRUE@ -I$(top_srcdir)/src \
@LINUX_HOST_TRUE@ -I$(top_srcdir)/src/testing/include \
@LINUX_HOST_TRUE@ -I$(top_srcdir)/src/testing/gtest/include \
@LINUX_HOST_TRUE@ -I$(top_srcdir)/src/testing/gtest \
@ -844,6 +845,7 @@ src_processor_binarystream_unittest_SOURCES = \
src/testing/src/gmock-all.cc
src_processor_binarystream_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -858,6 +860,7 @@ src_processor_basic_source_line_resolver_unittest_SOURCES = \
src/testing/src/gmock-all.cc
src_processor_basic_source_line_resolver_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -882,6 +885,7 @@ src_processor_cfi_frame_info_unittest_LDADD = \
src/processor/pathname_stripper.lo
src_processor_cfi_frame_info_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -900,6 +904,7 @@ src_processor_minidump_processor_unittest_SOURCES = \
src/testing/src/gmock-all.cc
src_processor_minidump_processor_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -934,6 +939,7 @@ src_processor_minidump_unittest_SOURCES = \
src/testing/src/gmock-all.cc
src_processor_minidump_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -951,6 +957,7 @@ src_processor_network_source_line_resolver_unittest_SOURCES = \
src/testing/src/gmock-all.cc
src_processor_network_source_line_resolver_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -972,6 +979,7 @@ src_processor_network_source_line_resolver_server_unittest_SOURCES = \
src/testing/src/gmock-all.cc
src_processor_network_source_line_resolver_server_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -1008,6 +1016,7 @@ src_processor_network_source_line_server_unittest_SOURCES = \
src/testing/src/gmock-all.cc
src_processor_network_source_line_server_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -1027,8 +1036,9 @@ src_processor_static_map_unittest_SOURCES = \
src/testing/src/gmock-all.cc
src_processor_static_map_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
-I$(top_srcdir)/src/testing
@ -1087,6 +1097,7 @@ src_processor_stackwalker_amd64_unittest_LDADD = \
src/libbreakpad.la
src_processor_stackwalker_amd64_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -1103,6 +1114,7 @@ src_processor_stackwalker_arm_unittest_LDADD = \
src/libbreakpad.la
src_processor_stackwalker_arm_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -1119,6 +1131,7 @@ src_processor_stackwalker_x86_unittest_LDADD = \
src/libbreakpad.la
src_processor_stackwalker_x86_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -1135,6 +1148,7 @@ src_processor_synth_minidump_unittest_SOURCES = \
src/processor/synth_minidump.h
src_processor_synth_minidump_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \
@ -1149,6 +1163,7 @@ src_common_test_assembler_unittest_SOURCES = \
src/testing/src/gmock-all.cc
src_common_test_assembler_unittest_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/testing/include \
-I$(top_srcdir)/src/testing/gtest/include \
-I$(top_srcdir)/src/testing/gtest \