Fork me on GitHub

Changeset fbad4c7 in git for readers/CMakeLists.txt


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

  • readers/CMakeLists.txt

    r4fd4f01 rfbad4c7  
    99list(REMOVE_ITEM executables DelphesCMSFWLite.cpp)
    1010list(REMOVE_ITEM executables DelphesProMC.cpp)
    11 list(REMOVE_ITEM executables DelphesPythia8.cpp)
     11if(NOT PYTHIA8_FOUND)
     12  list(REMOVE_ITEM executables DelphesPythia8.cpp)
     13endif()
    1214
    1315# build all executables and put them into bin/
Note: See TracChangeset for help on using the changeset viewer.