Skip to content

Commit

Permalink
JANA2.1.0 compiles with USE_PODIO=On (#576)
Browse files Browse the repository at this point in the history
### Briefly, what does this PR introduce?
This is the smallest set of changes needed to make EICrecon compile when
using JANA2 2.1.0 with USE_PODIO=On.
This doesn't use the new features, which will come in a separate pull
request.

### What kind of change does this PR introduce?
- [ ] Bug fix (issue #__)
- [ ] New feature (issue #__)
- [ ] Documentation update
- [x] Other: Enables dependency upgrade

### Please check if this PR fulfills the following:
- [ ] Tests for the changes have been added
- [ ] Documentation has been added / updated
- [x] Changes have been communicated to collaborators

### Does this PR introduce breaking changes? What changes might users
need to make to their code?
No.

### Does this PR change default behavior?
No.

---------

Co-authored-by: Dmitry Romanov <[email protected]>
  • Loading branch information
nathanwbrei and DraTeots authored Mar 27, 2023
1 parent f375494 commit c704fee
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/examples/log_example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ plugin_add(${PLUGIN_NAME})
# Then correctly sets sources for ${_name}_plugin and ${_name}_library targets
# Adds headers to the correct installation directory
plugin_glob_all(${PLUGIN_NAME})

# TODO his is a temporary fix for JANA 2.1.0. This plugin have nothing to do with event model
plugin_add_event_model(${PLUGIN_NAME})
2 changes: 1 addition & 1 deletion src/services/geometry/acts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ plugin_glob_all(${PLUGIN_NAME})

# Add libraries
# (same as target_include_directories but for both plugin and library)
plugin_link_libraries(${PLUGIN_NAME} algorithms_digi_library algorithms_tracking_library)
plugin_link_libraries(${PLUGIN_NAME} podio::podio podio::podioRootIO algorithms_digi_library algorithms_tracking_library)

#
## Add include directories (works same as target_include_directories)
Expand Down
2 changes: 1 addition & 1 deletion src/utilities/eicrecon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ find_package(ROOT REQUIRED COMPONENTS Core Tree Hist RIO EG)
file(GLOB SOURCES *.cpp *.cc *.c *.hpp *.hh *.h)

set( INCLUDE_DIRS ${PROJECT_BINARY_DIR} ${EICRECON_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR} ${JANA_INCLUDE_DIR} ${ROOT_INCLUDE_DIRS})
set( LINK_LIBRARIES ${JANA_LIB} ${ROOT_LIBRARIES} ${CMAKE_DL_LIBS} Threads::Threads )
set( LINK_LIBRARIES ${JANA_LIB} ${ROOT_LIBRARIES} ${CMAKE_DL_LIBS} Threads::Threads podio::podio podio::podioRootIO)

# Define executable
add_executable( eicrecon ${SOURCES} )
Expand Down

0 comments on commit c704fee

Please sign in to comment.