ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-12 21:53:03 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes #81: Updated other Makefiles to get tests to link

Browse Source
This commit is contained in:
John M. Penn 2015-07-16 15:02:33 -05:00
parent 3a70ffb156
commit a5e7699d40
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
trick_source/sim_services/Clock/test/Makefile
View File

@ -10,7 +10,11 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
# Flags passed to the preprocessor.
TRICK_CPPFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0
GTEST_LIBS = ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
LIBS = ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
ifeq ($(TRICK_HOST_TYPE), Linux)
LIBS += -lpthread -lrt
endif
BASE_OBJECTS = ../object_${TRICK_HOST_CPU}/Clock.o\
../object_${TRICK_HOST_CPU}/clock_c_intf.o
@ -42,17 +46,17 @@ GetTimeOfDayClock_test.o : GetTimeOfDayClock_test.cpp
$(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $<
GetTimeOfDayClock_test : ${GETTIMEOFDAY_CLOCK_OBJECTS}
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ ${GTEST_LIBS}
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ ${LIBS}
TPROCTEClock_test.o : TPROCTEClock_test.cpp
$(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $<
TPROCTEClock_test : ${TPROCTE_CLOCK_OBJECTS}
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ ${GTEST_LIBS}
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ ${LIBS}
BC635Clock_test.o : BC635Clock_test.cpp
$(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $<
BC635Clock_test : ${BC635_CLOCK_OBJECTS}
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ ${GTEST_LIBS}
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ ${LIBS}

4
trick_source/sim_services/Executive/test/Makefile
View File

@ -10,7 +10,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
# Flags passed to the preprocessor.
TRICK_CPPFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0
TRICK_LIBS = -L ${TRICK_LIB_DIR} -ltrick -ltrick_units -ltrick_mm
TRICK_LIBS = -L ${TRICK_LIB_DIR} -ltrick_mm -ltrick_units -ltrick
TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
# All tests produced by this Makefile. Remember to add new tests you
@ -34,5 +34,5 @@ Executive_test.o : Executive_test.cpp
$(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $<
Executive_test : Executive_test.o
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)

2
trick_source/sim_services/MemoryManager/test/Makefile
View File

@ -13,7 +13,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
# Flags passed to the preprocessor.
TRICK_CPPFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra ${COVERAGE_FLAGS}
TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick_units -ltrick_mm -ltrick -ltrick_units -ltrick_mm -ltrick
TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick_mm -ltrick_units -ltrick -ltrick_mm -ltrick_units -ltrick
TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a

4
trick_source/sim_services/MonteCarlo/test/Makefile
View File

@ -16,7 +16,7 @@ TRICK_CXXFLAGS += -I${GSL_HOME}/include
endif
endif
TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_units -ltrick_math -ltrick_mm
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
# All tests produced by this Makefile. Remember to add new tests you
@ -50,4 +50,4 @@ MonteCarlo_exceptions.o : MonteCarlo_exceptions.cpp
$(TRICK_CPPC) $(TRICK_CXXFLAGS) -c $<
MonteCarlo_exceptions : MonteCarlo_exceptions.o
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)

3
trick_source/sim_services/ScheduledJobQueue/test/Makefile
View File

@ -10,7 +10,8 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
# Flags passed to the preprocessor.
TRICK_CPPFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0
TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick -ltrick_units -ltrick_mm
TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick_mm -ltrick_units -ltrick -ltrick_mm -ltrick_units -ltrick
TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
# All tests produced by this Makefile. Remember to add new tests you

2
trick_source/sim_services/Timer/test/Makefile
View File

@ -34,5 +34,5 @@ ITimer_test.o : ITimer_test.cpp
$(TRICK_CPPC) $(TRICK_CPPFLAGS) -c $<
ITimer_test : ITimer_test.o
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)
$(TRICK_LD) $(TRICK_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)