Changes in / [90187bd:73bc3ca] in git

Files:

• CMakeLists.txt (modified) (3 diffs)
• cmake/Modules/FindPythia8.cmake (deleted)
• readers/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -26 +26 @@
 ENDIF(SET_RPATH)
     
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
-
 # Declare ROOT dependency
 find_package(ROOT COMPONENTS EG Eve Geom Gui GuiHtml GenVector Hist Physics Matrix Graf RIO Tree Gpad RGL MathCore)
 include(${ROOT_USE_FILE})
-
-
-# Declare Pythia8 dependancy
-find_package(Pythia8)
-if(PYTHIA8_FOUND)
-  message(STATUS "Pythia8 found")
-  include_directories(${PYTHIA8_INCLUDE_DIRS})
-  set(LIBS ${LIBS} ${PYTHIA8_LIBRARIES})
-endif(PYTHIA8_FOUND)
-
 
 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -53 +41 @@
   endif()
 endfunction()
-
-
 
 # Declare position of all other externals needed
@@ -91 +77 @@
 target_link_Libraries(Delphes ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES})
 target_link_Libraries(DelphesDisplay ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES})
-if(PYTHIA8_FOUND)
-  target_link_libraries(Delphes ${LIBS}) # needed for DelphesPythia8
-endif(PYTHIA8_FOUND)
-
 
 install(TARGETS Delphes DelphesDisplay DESTINATION lib)

readers/CMakeLists.txt

@@ -9 +9 @@
 list(REMOVE_ITEM executables DelphesCMSFWLite.cpp)
 list(REMOVE_ITEM executables DelphesProMC.cpp)
-if(NOT PYTHIA8_FOUND)
-  list(REMOVE_ITEM executables DelphesPythia8.cpp)
-endif()
+list(REMOVE_ITEM executables DelphesPythia8.cpp)
 
 # build all executables and put them into bin/