Fork me on GitHub

Changeset fbad4c7 in git for doc/genMakefile.tcl


Ignore:
Timestamp:
May 24, 2018, 9:12:31 PM (6 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
4689481
Parents:
4fd4f01 (diff), 792092a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into photonId

Conflicts:

cards/CMS_PhaseII/CMS_PhaseII_200PU_v03.tcl

File:
1 edited

Legend:

Unmodified
Added
Removed

  • doc/genMakefile.tcl

    r4fd4f01 rfbad4c7  
    208208PcmSuf = _rdict.pcm
    209209
    210 CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
     210CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl -I/usr/include/tirpc
    211211DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
    212212DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml $(SYSLIBS)
Note: See TracChangeset for help on using the changeset viewer.