mirror of
https://github.com/nasa/trick.git
synced 2025-01-30 08:03:51 +00:00
941eb5c1cc
I changed trick comm so that there is only one version built, not a slightly different version if you are in or out of a sim. While I was in the trick comm code, I removed all of the unnecessary system header file inclusions out of tc.h. I modified each of the source files to include the system files it requires. Some sim_services files were including tc.h and also had to be edited to add headers. I removed the stand-alone makefiles out of all of the trick_utils directories. Finally I modified the master makefile to exclude the trick_util directories comm, math, and units from being archived into libtrick.a. Each of those directories will create their own library and will be included when linking a Trick sim. refs #71
36 lines
992 B
Makefile
36 lines
992 B
Makefile
|
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
|
|
include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
|
|
|
|
INCLUDE_DIRS = -I$(GTEST_HOME) -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include
|
|
|
|
# Use the trick_comm library only. libtrick.a would also work.
|
|
TRICK_LIBS := ${TRICK_LIB_DIR}/libtrick_comm.a
|
|
|
|
TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
|
|
|
|
TRICK_CXXFLAGS += ${INCLUDE_DIRS} -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0
|
|
|
|
# Automatically determine all executable names produced by this Makefile.
|
|
TESTS = comm_test
|
|
TEST_CPP = $(subst $(OBJ_DIR)/,,$(subst .o,.cpp,$(CPP_OBJS)))
|
|
|
|
default : all
|
|
|
|
all : objects $(TESTS)
|
|
|
|
# Set XML test results name
|
|
test : all
|
|
@ for i in $(TESTS) ; do \
|
|
./$$i --gtest_output=xml:${TRICK_HOME}/trick_test/TrickComm.xml; \
|
|
done
|
|
|
|
clean : clean_test
|
|
|
|
clean_test :
|
|
$(RM) -rf $(TESTS)
|
|
|
|
$(TESTS) : $(CPP_OBJS)
|
|
$(TRICK_LD) $(TRICK_CXXFLAGS) -o $@ $^ $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)
|
|
|