Skip to content

Removing Vdt includes #270

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

Open
kjvbrt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removing Vdt includes #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion addons/ONNXRuntime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if(BUILD_TESTING)
# add all unit tests
add_executable(onnxruntime-unittest test/onnxtest.cpp)
target_link_libraries(onnxruntime-unittest PUBLIC FCCAnalyses gfortran PRIVATE Catch2::Catch2WithMain ONNXRuntime)
target_include_directories(onnxruntime-unittest PUBLIC ${VDT_INCLUDE_DIR} ${ONNXRUNTIME_INCLUDE_DIRS})
target_include_directories(onnxruntime-unittest PUBLIC ${ONNXRUNTIME_INCLUDE_DIRS})
target_compile_definitions(onnxruntime-unittest PUBLIC "-DTEST_INPUT_DATA_DIR=${TEST_INPUT_DATA_DIR}")
include(Catch)
catch_discover_tests(onnxruntime-unittest
Expand Down
7 changes: 0 additions & 7 deletions analyzers/dataframe/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@


# workaround for ROOT not properly exporting the VDT includes
find_package(Vdt)


message(STATUS "includes-------------------------- dataframe edm4hep: ${EDM4HEP_INCLUDE_DIRS}")
message(STATUS "includes-------------------------- dataframe podio : ${podio_INCLUDE_DIR}")
message(STATUS "includes-------------------------- dataframe delphes: ${DELPHES_INCLUDE_DIR}")
Expand Down Expand Up @@ -49,7 +43,6 @@ target_include_directories(FCCAnalyses PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/addons>
$<INSTALL_INTERFACE:include>
${VDT_INCLUDE_DIR}
${DELPHES_INCLUDE_DIR}
${DELPHES_EXTERNALS_INCLUDE_DIR}
${DELPHES_EXTERNALS_TKCOV_INCLUDE_DIR}
Expand Down
3 changes: 0 additions & 3 deletions analyzers/dataframe/case-studies/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ find_package(ROOT REQUIRED COMPONENTS ROOTDataFrame ROOTVecOps TMVA)
include(${ROOT_USE_FILE})
#include("${ROOT_DIR}/modules/RootNewMacros.cmake")

find_package(Vdt)

set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})

get_target_property(EDM4HEP_INCLUDE_DIRS EDM4HEP::edm4hep INTERFACE_INCLUDE_DIRECTORIES)
Expand All @@ -13,7 +11,6 @@ include_directories(${EDM4HEP_INCLUDE_DIRS}
${podio_INCLUDE_DIR}
${FASTJET_INCLUDE_DIR}
${acts_INCLUDE_DIR}
${VDT_INCLUDE_DIR}
)

message(STATUS "includes-------------------------- dataframe edm4hep: ${EDM4HEP_INCLUDE_DIRS}")
Expand Down
82 changes: 0 additions & 82 deletions cmake/FindVdt.cmake
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tests/benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ set(filter_tests "")

add_executable(bench algorithms.cpp myutils.cpp)
target_link_libraries(bench PUBLIC FCCAnalyses gfortran PRIVATE Catch2::Catch2WithMain)
target_include_directories(bench PUBLIC ${VDT_INCLUDE_DIR})

include(Catch)
catch_discover_tests(bench
Expand Down
1 change: 0 additions & 1 deletion tests/unittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ set(filter_tests "")

add_executable(unittest unittest.cpp myutils.cpp algorithms.cpp)
target_link_libraries(unittest PUBLIC FCCAnalyses gfortran PRIVATE Catch2::Catch2WithMain)
target_include_directories(unittest PUBLIC ${VDT_INCLUDE_DIR})
target_compile_definitions(unittest PUBLIC "-DTEST_INPUT_DATA_DIR=${TEST_INPUT_DATA_DIR}")
include(Catch)
catch_discover_tests(unittest
Expand Down