- Timestamp:
- Jul 4, 2013, 1:36:57 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r1167 r1169 21 21 22 22 ifneq ($(PYTHIA8),) 23 HAS_PYTHIA8 = true 23 24 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8)/include 24 DELPHES_LIBS += -L$(PYTHIA8)/lib/archive -lpythia8 -llhapdfdummy 25 DELPHES_LIBS += -L$(PYTHIA8)/lib -lpythia8 -llhapdfdummy 26 else 27 ifneq ($(PYTHIA8DATA),) 28 HAS_PYTHIA8 = true 29 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include 30 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy 31 else 32 ifneq ($(PYTHIA8DATA),) 33 HAS_PYTHIA8 = true 34 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include 35 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib/archive -lpythia8 -llhapdfdummy 25 36 endif 37 endif 38 26 39 27 40 ### … … 905 918 tmp/external/fastjet/plugins/EECambridge/EECambridgePlugin.$(ObjSuf) 906 919 907 if neq ($(PYTHIA8),)920 ifeq ($(HAS_PYTHIA8),true) 908 921 DELPHES_OBJ += \ 909 922 tmp/modules/PileUpMergerPythia8.$(ObjSuf) … … 919 932 tmp/display/DelphesCaloData.$(ObjSuf) 920 933 921 if neq ($(PYTHIA8),)934 ifeq ($(HAS_PYTHIA8),true) 922 935 DISPLAY_OBJ += \ 923 936 … … 1380 1393 @mkdir -p $(@D) 1381 1394 @echo ">> Generating $@" 1382 @rootcint -f $@ -c -Iexternal$<1395 @rootcint -f $@ -c $(CXXFLAGS) $< 1383 1396 @echo "#define private public" > $@.arch 1384 1397 @echo "#define protected public" >> $@.arch -
trunk/doc/genMakefile.tcl
r1168 r1169 212 212 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include 213 213 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib -lpythia8 -llhapdfdummy 214 else 215 ifneq ($(PYTHIA8DATA),) 216 HAS_PYTHIA8 = true 217 CXXFLAGS += -DHAS_PYTHIA8 -I$(PYTHIA8DATA)/../include 218 DELPHES_LIBS += -L$(PYTHIA8DATA)/../lib/archive -lpythia8 -llhapdfdummy 214 219 endif 215 220 endif
Note:
See TracChangeset
for help on using the changeset viewer.