Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not include ROOT's CMake "use" file to avoid potential nlohmann_json conflicts #556

Merged
merged 2 commits into from
Nov 23, 2022
Merged

Do not include ROOT's CMake "use" file to avoid potential nlohmann_json conflicts #556

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eecb1bc
Do not include ROOT's use file
drbenmorgan Nov 23, 2022
dc8476c
Inline ROOT dictionary generation
drbenmorgan Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 51 additions & 54 deletions src/celeritas/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,60 +137,57 @@ if(CELERITAS_USE_OpenMP)
endif()

if(CELERITAS_USE_ROOT)
# Call the ROOT library generation inside a function to prevent ROOT-defined
# directory properties from escaping
function(celeritas_root_library objlib root_tgt)
include(${ROOT_USE_FILE})
# Use directory includes because ROOT has trouble with build/install
# interface dependencies propagated through corecel
include_directories(
"${PROJECT_SOURCE_DIR}/src"
"${CELERITAS_HEADER_CONFIG_DIRECTORY}"
)

# Set the CMAKE output directory locally to inform ROOT where we put our
# libs
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CELERITAS_LIBRARY_OUTPUT_DIRECTORY})

# Generate the
root_generate_dictionary(${root_tgt}
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportData.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportElement.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportMaterial.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportParticle.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportPhysicsTable.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportPhysicsVector.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportProcess.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportVolume.hh"
NOINSTALL
MODULE celeritas
LINKDEF "${CMAKE_CURRENT_SOURCE_DIR}/ext/RootInterfaceLinkDef.h"
)
celeritas_add_object_library(${objlib}
ext/RootExporter.cc
ext/RootImporter.cc
ext/ScopedRootErrorHandler.cc
ext/detail/TFileUniquePtr.root.cc
"${CMAKE_CURRENT_BINARY_DIR}/${root_tgt}.cxx"
)
target_link_libraries(${objlib}
PRIVATE Celeritas::corecel ROOT::Core ROOT::Tree
)

# Install the rootmap/pcm files needed for users or downstream apps to use
# Celeritas ROOT interfaces
set(_lib_prefix
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}celeritas"
)
install(FILES
"${_lib_prefix}.rootmap"
"${_lib_prefix}_rdict.pcm"
COMPONENT runtime
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)
endfunction()

celeritas_root_library(celeritas_root CeleritasRootInterface)
# Use directory includes because ROOT has trouble with build/install
# interface dependencies propagated through corecel.
# This is safe here as it is only adding project-local paths that are
# identical to those set in corecel's usage requirments.
include_directories(
"${PROJECT_SOURCE_DIR}/src"
"${CELERITAS_HEADER_CONFIG_DIRECTORY}"
)

# Set the CMAKE output directory locally to inform ROOT where we put our
# libs. Safe against overriding project settings as the celeritas_add_...
# functions set this to the same value for our targets.
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CELERITAS_LIBRARY_OUTPUT_DIRECTORY})

# Generate the dictionary source file
root_generate_dictionary(CeleritasRootInterface
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportData.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportElement.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportMaterial.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportParticle.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportPhysicsTable.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportPhysicsVector.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportProcess.hh"
"${CMAKE_CURRENT_SOURCE_DIR}/io/ImportVolume.hh"
NOINSTALL
MODULE celeritas
LINKDEF "${CMAKE_CURRENT_SOURCE_DIR}/ext/RootInterfaceLinkDef.h"
)
celeritas_add_object_library(celeritas_root
ext/RootExporter.cc
ext/RootImporter.cc
ext/ScopedRootErrorHandler.cc
ext/detail/TFileUniquePtr.root.cc
"${CMAKE_CURRENT_BINARY_DIR}/CeleritasRootInterface.cxx"
)
target_link_libraries(celeritas_root
PRIVATE Celeritas::corecel ROOT::Core ROOT::Tree
)

# Install the rootmap/pcm files needed for users or downstream apps to use
# Celeritas ROOT interfaces
set(_lib_prefix
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}celeritas"
)
install(FILES
"${_lib_prefix}.rootmap"
"${_lib_prefix}_rdict.pcm"
COMPONENT runtime
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)

list(APPEND SOURCES $<TARGET_OBJECTS:celeritas_root>)
list(APPEND PRIVATE_DEPS celeritas_root)
endif()
Expand Down