Skip to content

Commit c5820e2

Browse files
committed
Fixes for cmake on osx
1 parent 9826a9b commit c5820e2

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
1616
include(FindPackageHandleStandardArgs)
1717
find_package(fmt REQUIRED)
1818
find_package(ROOT REQUIRED)
19-
find_package(Delphes REQUIRED)
2019
find_package(FairLogger REQUIRED)
2120
find_package(FairRoot REQUIRED)
2221
find_package(AliceO2 REQUIRED)
22+
find_package(Delphes REQUIRED)
2323

2424
include("${ROOT_DIR}/RootMacros.cmake")
2525

cmake/FindDelphes.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ find_path(Delphes_INCLUDE_DIR
99
PATH_SUFFIXES "include")
1010

1111
find_library(Delphes_LIBRARY
12-
NAMES libDelphes.so
12+
NAMES libDelphes.so libDelphes.dylib
1313
HINTS ${DELPHES_ROOT}/lib
1414
ENV LD_LIBRARY_PATH)
1515

@@ -31,6 +31,5 @@ if(${Delphes_FOUND})
3131
INTERFACE_LINK_LIBRARIES "${Delphes_LIBRARIES}"
3232
)
3333
endif()
34-
35-
endif()
3634

35+
endif()

cmake/FindHepMC.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ find_path(HepMC_INCLUDE_DIR
1616
set(HepMC_INCLUDE_DIR ${HepMC_INCLUDE_DIR}/..)
1717

1818
find_library(HepMC_LIBRARIES
19-
NAMES libHepMC.so libHepMCfio.
19+
NAMES libHepMC.so libHepMCfio.so libHepMC.dylib libHepMCfio.dylib
2020
PATHS $ENV{HEPMC_ROOT}/lib)
2121

2222
find_package_handle_standard_args(HepMC
2323
REQUIRED_VARS HepMC_INCLUDE_DIR HepMC_LIBRARIES
2424
FAIL_MESSAGE "HepMC could not be found")
25-

cmake/FindPythia.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ find_path(Pythia_INCLUDE_DIR
1414
PATHS $ENV{PYTHIA_ROOT}/include)
1515

1616
set(Pythia_INCLUDE_DIR ${Pythia_INCLUDE_DIR}/..)
17-
17+
1818
find_library(Pythia_LIBRARIES
1919
NAMES libpythia8.so libpythia8.dylib
2020
PATHS $ENV{PYTHIA_ROOT}/lib)
2121

2222
find_package_handle_standard_args(Pythia
2323
REQUIRED_VARS Pythia_INCLUDE_DIR Pythia_LIBRARIES
2424
FAIL_MESSAGE "Pythia could not be found")
25-

src/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ root_generate_dictionary(G__DelphesO2 ${HEADERS} LINKDEF DelphesO2LinkDef.h)
4646
target_link_libraries(DelphesO2
4747
Delphes::Core
4848
ROOT::MathCore
49+
ROOT::RIO
50+
ROOT::EG
4951
AliceO2::DetectorsVertexing
5052
AliceO2::ReconstructionDataFormats
5153
AliceO2::GPUCommon

0 commit comments

Comments
 (0)