Commit 8bb708b3 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Merge branch '32-boost-flags-are-not-propagated-to-tests' into 'master' 

Resolve "BOOST flags are not propagated to tests"

Propagate BOOST_CPPFLAGS to tests

Closes #32

See merge request !15
parents a38ec381 54aae36c

tests/Makefile.am

+32 −30
Original line number Diff line number Diff line
@@ -33,11 +33,23 @@ check_PROGRAMS = $(TESTS) api_interactive 


END = 



COMMON_SOURCES = \

	compare-files.cpp \

	compare-files.hpp \

	config-template.cpp \

	config-template.hpp \

	fake-daemon.cpp \

	fake-daemon.hpp \

	test-env.cpp \

	test-env.hpp \

	$(END)



api_CXXFLAGS = \

	-Wall -Wextra \

	$(END)



api_CPPFLAGS = \

	@BOOST_CPPFLAGS@ \

	-I$(top_srcdir)/include \

	-I$(top_srcdir)/rpc \

	-I$(top_srcdir)/src \
@@ -69,14 +81,7 @@ api_SOURCES = \ 
	api-ctl-task-status.cpp \

	api-ctl-copy-remote-data.cpp \

	api-ctl-remove-local-data.cpp \

	compare-files.cpp \

	compare-files.hpp \

	config-template.cpp \

	config-template.hpp \

	fake-daemon.cpp \

	fake-daemon.hpp \

	test-env.cpp \

	test-env.hpp \

	$(COMMON_SOURCES) \

	$(END)



api_LDFLAGS = \
@@ -140,11 +145,12 @@ core_CXXFLAGS = \ 
	$(END)



core_CPPFLAGS = \

	@BOOST_CPPFLAGS@ \

	-I$(top_srcdir)/include \

	-I$(top_srcdir)/src/externals/hermes/include \

	-I$(top_srcdir)/rpc \

	-I$(top_srcdir)/src \

	-DUSE_REAL_DAEMON \

	-I$(top_srcdir)/src/externals/hermes/include \

	-D__NORNS_DEBUG__ \

	$(END)



core_SOURCES = \
@@ -152,22 +158,18 @@ core_SOURCES = \ 
	api-main.cpp \

	utils-path-normalize.cpp \

	utils-tar.cpp \

	test-env.cpp \

	test-env.hpp \

	compare-files.cpp \

	compare-files.hpp \

	$(COMMON_SOURCES) \

	$(END)



core_LDFLAGS = \

	-no-install \

	-fsanitize=address \

	-fno-omit-frame-pointer \

	@BOOST_ASIO_LIB@ \

	@BOOST_LDFLAGS@	\

	@BOOST_FILESYSTEM_LIB@ \

	@BOOST_PROGRAM_OPTIONS_LIB@	\

	@BOOST_SYSTEM_LIB@ \

	@BOOST_THREAD_LIB@ \

	@BOOST_REGEX_LIB@ \

	@PROTOBUF_LIBS@ \

	$(top_builddir)/src/liburd_aux.la \

	$(top_builddir)/lib/libnorns_debug.la \