Changeset 18015 for branches/AddingGoogleTestEnvironment
- Timestamp:
- 11/15/14 03:25:58 (10 years ago)
- Location:
- branches/AddingGoogleTestEnvironment
- Files:
-
- 26 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/AddingGoogleTestEnvironment/Makefile
r17980 r18015 21 21 # 22 22 #PROGRAMS = readraw merpp mars test mona status 23 PROGRAMS := r eaddaq readraw readcorsika ceres merpp callisto star ganymed sponde showlog showplot mars mars-config23 PROGRAMS := run_tests readdaq readraw readcorsika ceres merpp callisto star ganymed sponde showlog showplot mars mars-config 24 24 SOLIB := libmars.so 25 25 … … 134 134 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) 135 135 @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) 137 137 mv ${RNDMNAME} $@ 138 138 chmod go+r $@ … … 143 143 $(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB) 144 144 @echo " Linking $@ ..." 145 $(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@ 145 $(LINKER) $(CXXFLAGS) $@.o $(MARS_LIB) $(SOLIB) $(ROOTGLIBS) -o $@ $(GTESTLIBS) 146 146 147 147 # Use this to link the programs statically - for gprof … … 152 152 $(DYLIB): $(LIBRARIES) $(OBJS) $(HEADERS) 153 153 @echo " Linking dylib $(DYLIB) ..." 154 $(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@ 154 $(LINKER) $(CXXFLAGS) $(DYFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@ $(GTESTLIBS) 155 155 156 156 $(PROGRAMS): $(PROGRAMS:=.o) $(DYLIB) 157 157 @echo " Linking mac executable $@ ..." 158 $(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@ 158 $(LINKER) $(CXXFLAGS) $(ROOTGLIBS) $(DYLIB) $@.o $(MARS_LIB) -o $@ $(GTESTLIBS) 159 159 endif 160 160 -
branches/AddingGoogleTestEnvironment/Makefile.conf.general
r17245 r18015 6 6 ROOTGLIBS := $(shell root-config --glibs) -lASImage -lMinuit -lHistPainter -lThread 7 7 ROOTCFLAGS := $(shell root-config --cflags) 8 GTESTLIBS := -lgtest -lpthread 8 9 9 10 SVN_REVISION := -DREVISION=\"$(shell svnversion -n .)\"
Note:
See TracChangeset
for help on using the changeset viewer.