Ignore:
Timestamp:
11/15/14 03:25:58 (10 years ago)
Author:
smueller
Message:
Google Test, new executeable run_test. From now on gtest is required to build MARS. Makefile was adjusted to build the new run_test executeable and link it with gtest libs. A first test was made for the MMatrix Container. All tests are in a new mtest folder.
Location:
branches/AddingGoogleTestEnvironment
Files:
26 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/AddingGoogleTestEnvironment/Makefile

    r17980 r18015  
    2121#
    2222#PROGRAMS = readraw merpp mars test mona status
    23 PROGRAMS := readdaq readraw readcorsika ceres merpp callisto star ganymed sponde showlog showplot mars mars-config
     23PROGRAMS := run_tests readdaq readraw readcorsika ceres merpp callisto star ganymed sponde showlog showplot mars mars-config
    2424SOLIB    := libmars.so
    2525
     
    134134$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
    135135        @echo " Linking shared object $@ ..."
    136         $(LINKER) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME}
     136        $(LINKER) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) $(LIBNOVA) -o ${RNDMNAME} $(GTESTLIBS)
    137137        mv ${RNDMNAME} $@
    138138        chmod go+r $@
     
    143143$(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB)
    144144        @echo " Linking $@ ..."
    145         $(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@
     145        $(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@ $(GTESTLIBS)
    146146
    147147# Use this to link the programs statically - for gprof
     
    152152$(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
    153153        @echo " Linking dylib $(DYLIB) ..."
    154         $(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
     154        $(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@ $(GTESTLIBS)
    155155
    156156$(PROGRAMS): $(PROGRAMS:=.o) $(DYLIB)
    157157        @echo " Linking mac executable $@ ..."
    158         $(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@
     158        $(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@ $(GTESTLIBS)
    159159endif
    160160
  • branches/AddingGoogleTestEnvironment/Makefile.conf.general

    r17245 r18015  
    66ROOTGLIBS  := $(shell root-config --glibs) -lASImage -lMinuit -lHistPainter -lThread
    77ROOTCFLAGS := $(shell root-config --cflags)
     8GTESTLIBS  := -lgtest -lpthread
    89
    910SVN_REVISION := -DREVISION=\"$(shell svnversion -n .)\"
Note: See TracChangeset for help on using the changeset viewer.