diff options
| author | William A. Kennington III <wak@google.com> | 2018-01-24 16:56:41 -0800 |
|---|---|---|
| committer | William A. Kennington III <wak@google.com> | 2018-01-29 12:00:03 -0800 |
| commit | e2aab94bd5284496c7ac0547d358c34ea8032220 (patch) | |
| tree | 39f21debe5189e177868b968fb0483dffd52208a /test | |
| parent | a55c72594c50e7372d6cad815e5ebba0d0f4817f (diff) | |
| download | phosphor-watchdog-e2aab94bd5284496c7ac0547d358c34ea8032220.tar.gz phosphor-watchdog-e2aab94bd5284496c7ac0547d358c34ea8032220.zip | |
configure/make: Allow googletest from pkg-config
Change-Id: I2eb526827987dd2361d35fd782229b1461d49d01
Signed-off-by: William A. Kennington III <wak@google.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 259e357..173e0e2 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -7,21 +7,20 @@ TESTS = $(check_PROGRAMS) check_PROGRAMS = timer_test \ watchdog_test -utestCPPFLAGS = -Igtest \ - $(GTEST_CPPFLAGS) \ - $(AM_CPPFLAGS) \ - $(SDBUSPLUS_CFLAGS) \ - $(PHOSPHOR_LOGGING_CFLAGS) \ - $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) +utestCPPFLAGS = $(GTEST_MAIN_CFLAGS) \ + $(AM_CPPFLAGS) \ + $(SDBUSPLUS_CFLAGS) \ + $(PHOSPHOR_LOGGING_CFLAGS) \ + $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) utestCXXFLAGS = $(PTHREAD_CFLAGS) -utestLDFLAGS = -lgtest_main -lgtest \ - $(PTHREAD_LIBS) \ - $(OESDK_TESTCASE_FLAGS) \ - $(SDBUSPLUS_LIBS) \ - $(PHOSPHOR_LOGGING_LIBS) \ - $(PHOSPHOR_DBUS_INTERFACES_LIBS) +utestLDFLAGS = $(GTEST_MAIN_LIBS) \ + $(PTHREAD_LIBS) \ + $(OESDK_TESTCASE_FLAGS) \ + $(SDBUSPLUS_LIBS) \ + $(PHOSPHOR_LOGGING_LIBS) \ + $(PHOSPHOR_DBUS_INTERFACES_LIBS) timer_test_CPPFLAGS = ${utestCPPFLAGS} timer_test_CXXFLAGS = ${utestCXXFLAGS} |
