Skip to content

Commit

Permalink
CMake: Use external genfit2 in build
Browse files Browse the repository at this point in the history
  • Loading branch information
@olantwin
olantwin committed Oct 30, 2024
1 parent d4f2cb5 commit 6cf1bd3
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ it in future.
### Changed

* shipStrawTracking: Move to argparse
* CMake: Require external genfit2
* CMake: Use external genfit2

### Removed

Expand Down
2 changes: 2 additions & 0 deletions TimeDet/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/TimeDet
${genfit2_INCDIR}
)

include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
Expand All @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}
${genfit2_LIBDIR}
)

link_directories( ${LINK_DIRECTORIES})
Expand Down
2 changes: 2 additions & 0 deletions UpstreamTagger/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/UpstreamTagger
${genfit2_INCDIR}
)

include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})

set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${genfit2_LIBDIR}
${FAIRROOT_LIBRARY_DIR}
)

Expand Down
3 changes: 2 additions & 1 deletion ecal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set(INCLUDE_DIRECTORIES
#put here all directories where header files are located
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/ecal
${genfit2_INCDIR}
)

include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
Expand All @@ -14,7 +15,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}

${genfit2_LIBDIR}
)

link_directories( ${LINK_DIRECTORIES})
Expand Down
3 changes: 2 additions & 1 deletion hcal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/hcal
${genfit2_INCDIR}
)

include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
Expand All @@ -13,7 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}

${genfit2_LIBDIR}
)

link_directories( ${LINK_DIRECTORIES})
Expand Down
2 changes: 2 additions & 0 deletions muon/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/muon
${genfit2_INCDIR}
${VMC_INCLUDE_DIRS}
)

Expand All @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})

set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${genfit2_LIBDIR}
${FAIRROOT_LIBRARY_DIR}
)

Expand Down
2 changes: 2 additions & 0 deletions nutaudet/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/nutaudet
${ROOT_INCLUDE_DIR}
${VMC_INCLUDE_DIRS}
${genfit2_INCDIR}
)

include_directories(${INCLUDE_DIRECTORIES} ${FAIRROOT_INCLUDE_DIR})
Expand All @@ -16,6 +17,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}
${genfit2_LIBDIR}
)

link_directories( ${LINK_DIRECTORIES})
Expand Down
2 changes: 2 additions & 0 deletions pid/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/pid
${genfit2_INCDIR}
)

include_directories( ${INCLUDE_DIRECTORIES})
Expand All @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}
${genfit2_LIBDIR}
)

link_directories( ${LINK_DIRECTORIES})
Expand Down
7 changes: 3 additions & 4 deletions shipdata/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/genfit/core/include
${CMAKE_SOURCE_DIR}/genfit/fitters/include
${genfit2_INCDIR}
${VMC_INCLUDE_DIRS}
)

Expand All @@ -16,7 +15,7 @@ set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}
${CMAKE_SOURCE_DIR}/shipdata

${genfit2_LIBDIR}
)

link_directories( ${LINK_DIRECTORIES})
Expand All @@ -32,6 +31,6 @@ TrackInfo.cxx
Set(HEADERS )
Set(LINKDEF MCStackLinkDef.h)
Set(LIBRARY_NAME ShipData)
set(DEPENDENCIES Base EG Physics Core genfit FairLogger::FairLogger)
set(DEPENDENCIES Base EG Physics Core genfit2 FairLogger::FairLogger)

GENERATE_LIBRARY()
2 changes: 2 additions & 0 deletions shipgen/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ${CMAKE_SOURCE_DIR}/shipgen
${CMAKE_SOURCE_DIR}/generators
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/veto
${genfit2_INCDIR}
)

set(SYSTEM_INCLUDE_DIRECTORIES
Expand All @@ -26,6 +27,7 @@ ${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}
${PYTHIA8_LIBRARY_DIR}
${EVTGEN_LIBRARY_DIR}
${genfit2_LIBDIR}
${SIMPATH}/lib
)

Expand Down
2 changes: 2 additions & 0 deletions splitcal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/splitcal
${genfit2_INCDIR}
)

include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
Expand All @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}
${genfit2_LIBDIR}
)

link_directories( ${LINK_DIRECTORIES})
Expand Down
2 changes: 2 additions & 0 deletions strawtubes/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/strawtubes
${genfit2_INCDIR}
)

include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
Expand All @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}
${genfit2_LIBDIR}
)

link_directories( ${LINK_DIRECTORIES})
Expand Down
2 changes: 2 additions & 0 deletions veto/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
set(INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/shipdata
${CMAKE_SOURCE_DIR}/veto
${genfit2_INCDIR}
)

include_directories(${INCLUDE_DIRECTORIES} ${VMC_INCLUDE_DIRS} ${FAIRROOT_INCLUDE_DIR})
Expand All @@ -13,6 +14,7 @@ include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
set(LINK_DIRECTORIES
${ROOT_LIBRARY_DIR}
${FAIRROOT_LIBRARY_DIR}
${genfit2_LIBDIR}
)

link_directories( ${LINK_DIRECTORIES})
Expand Down

0 comments on commit 6cf1bd3

Please sign in to comment.