From adfecdef112fb7694cff8d185cca84d8ce30d591 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Thu, 30 Jun 2016 09:59:09 -0500 Subject: [PATCH] Search for some optional packages in configure script. Side effect of GSL included by default is that the monte carlo test code needs to know that. The test code did not include the HAVE_GSL flag correctly, causing the tests to fail. Fixed it. refs #260 --- trick_source/sim_services/MonteCarlo/test/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/trick_source/sim_services/MonteCarlo/test/Makefile b/trick_source/sim_services/MonteCarlo/test/Makefile index 871ee764..74065478 100644 --- a/trick_source/sim_services/MonteCarlo/test/Makefile +++ b/trick_source/sim_services/MonteCarlo/test/Makefile @@ -9,13 +9,6 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common # Flags passed to the preprocessor. TRICK_CXXFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0 -ifeq ($(HAVE_GSL),1) -TRICK_CXXFLAGS += -D_HAVE_GSL -ifneq ($(GSL_HOME),/usr) -TRICK_CXXFLAGS += -I${GSL_HOME}/include -endif -endif - TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_math -ltrick_mm -ltrick_units TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a @@ -41,13 +34,13 @@ clean : rm -f $(TESTS) *.o MonteCarlo_test.o : MonteCarlo_test.cpp - $(TRICK_CPPC) $(TRICK_CXXFLAGS) -c $< + $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< MonteCarlo_test : MonteCarlo_test.o $(TRICK_CPPC) $(TRICK_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS) MonteCarlo_exceptions.o : MonteCarlo_exceptions.cpp - $(TRICK_CPPC) $(TRICK_CXXFLAGS) -c $< + $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c $< MonteCarlo_exceptions : MonteCarlo_exceptions.o $(TRICK_CPPC) $(TRICK_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)