From 02ebd15e2013c0b0dcc9cb5b4b773bb733bf585e Mon Sep 17 00:00:00 2001 From: Krista Bennett Date: Thu, 29 Aug 2019 19:36:13 +0200 Subject: [PATCH] Makefile fixes --- test/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index 5c68190b..0a53f483 100644 --- a/test/Makefile +++ b/test/Makefile @@ -8,6 +8,7 @@ HERE:=$(CURDIR) # Presumably can be changed in local.conf by putting this here? GTEST_DIR:=googletest/googletest GTEST_PL_DIR:=googletest/gtest-parallel +GTEST_INC_DIR:=$(GTEST_DIR)/include include ../Makefile.conf @@ -54,7 +55,7 @@ endif CXXFLAGS:=$(filter-out -DNDEBUG,$(CXXFLAGS)) # FIXME Possibly missing incdirs: ASN1C_INC -CXXFLAGS+= -I./include -I../sync $(CPPUNIT_INC) $(INC_FLAGS) -Wno-deprecated +CXXFLAGS+= -I./src -I../sync $(CPPUNIT_INC) $(INC_FLAGS) -I$(GTEST_INC_DIR) -Wno-deprecated ifeq ($(OPENPGP),GPG) CXXFLAGS+= -DUSE_GPG $(GPGME_INC)