Removing Vdt includes

HEP-FCC · May 8, 2023 · 15e0eb4 · 15e0eb4
1 parent 3e853e5
commit 15e0eb4
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 95 deletions.
diff --git a/addons/ONNXRuntime/CMakeLists.txt b/addons/ONNXRuntime/CMakeLists.txt
@@ -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

diff --git a/analyzers/dataframe/CMakeLists.txt b/analyzers/dataframe/CMakeLists.txt
@@ -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}")
@@ -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}

diff --git a/analyzers/dataframe/case-studies/CMakeLists.txt b/analyzers/dataframe/case-studies/CMakeLists.txt
@@ -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)
@@ -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}")

diff --git a/cmake/FindVdt.cmake b/cmake/FindVdt.cmake
diff --git a/tests/benchmark/CMakeLists.txt b/tests/benchmark/CMakeLists.txt
@@ -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

diff --git a/tests/unittest/CMakeLists.txt b/tests/unittest/CMakeLists.txt
@@ -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