From 15e0eb403b40b51011aaf34fa8b20b13a093b794 Mon Sep 17 00:00:00 2001 From: Juraj Smiesko Date: Wed, 12 Apr 2023 14:27:00 +0200 Subject: [PATCH] Removing Vdt includes --- addons/ONNXRuntime/CMakeLists.txt | 2 +- analyzers/dataframe/CMakeLists.txt | 7 -- .../dataframe/case-studies/CMakeLists.txt | 3 - cmake/FindVdt.cmake | 82 ------------------- tests/benchmark/CMakeLists.txt | 1 - tests/unittest/CMakeLists.txt | 1 - 6 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 cmake/FindVdt.cmake diff --git a/addons/ONNXRuntime/CMakeLists.txt b/addons/ONNXRuntime/CMakeLists.txt index 12cf7961e7..0b88517f03 100644 --- 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 index 1c5cfb32d3..d5e2f587f2 100644 --- 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 $ $ $ - ${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 index a3416ecfae..a0ed7baa9b 100644 --- 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 deleted file mode 100644 index 1f8a4e87de..0000000000 --- a/cmake/FindVdt.cmake +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright (C) 1995-2019, Rene Brun and Fons Rademakers. -# All rights reserved. -# -# For the licensing terms see $ROOTSYS/LICENSE. -# For the list of contributors see $ROOTSYS/README/CREDITS. - -#.rst: -# FindVdt -# ------- -# -# Find the Vdt library header and define variables. -# -# Imported Targets -# ^^^^^^^^^^^^^^^^ -# -# This module defines :prop_tgt:`IMPORTED` target ``VDT::VDT``, -# if Vdt has been found. -# -# Result Variables -# ^^^^^^^^^^^^^^^^ -# -# This module defines the following variables: -# -# :: -# -# VDT_FOUND - True if Vdt is found. -# VDT_INCLUDE_DIRS - Where to find vdt/vdtMath.h -# -# :: -# -# VDT_VERSION - The version of Vdt found (x.y.z) -# VDT_VERSION_MAJOR - The major version of Vdt -# VDT_VERSION_MINOR - The minor version of Vdt -# VDT_VERSION_PATCH - The patch version of Vdt -# - -if(NOT VDT_INCLUDE_DIR) - find_path(VDT_INCLUDE_DIR NAME vdt/vdtMath.h PATH_SUFFIXES include) -endif() - -if(NOT VDT_LIBRARY) - find_library(VDT_LIBRARY NAMES vdt) -endif() - -mark_as_advanced(VDT_INCLUDE_DIR VDT_LIBRARY) - -if(VDT_INCLUDE_DIR) - file(STRINGS "${VDT_INCLUDE_DIR}/vdt/vdtMath.h" VDT_H REGEX "^#define VDT_VERSION_[A-Z]+[ ]+[0-9]+.*$") - string(REGEX REPLACE ".+VDT_VERSION_MAJOR[ ]+([0-9]+).*$" "\\1" VDT_VERSION_MAJOR "${VDT_H}") - string(REGEX REPLACE ".+VDT_VERSION_MINOR[ ]+([0-9]+).*$" "\\1" VDT_VERSION_MINOR "${VDT_H}") - string(REGEX REPLACE ".+VDT_VERSION_PATCH[ ]+([0-9]+).*$" "\\1" VDT_VERSION_PATCH "${VDT_H}") - set(VDT_VERSION "${VDT_VERSION_MAJOR}.${VDT_VERSION_MINOR}.${VDT_VERSION_PATCH}") - if("${VDT_VERSION}" STREQUAL "..") - if(EXISTS "${VDT_INCLUDE_DIR}/vdt/tanh.h") - set(VDT_VERSION "0.4") - else() - set(VDT_VERSION "0.3") - endif() - endif() -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Vdt FOUND_VAR VDT_FOUND - REQUIRED_VARS VDT_INCLUDE_DIR VDT_LIBRARY VERSION_VAR VDT_VERSION) - -if(VDT_FOUND) - set(VDT_INCLUDE_DIRS ${VDT_INCLUDE_DIR}) - - if(NOT VDT_LIBRARIES) - set(VDT_LIBRARIES ${VDT_LIBRARY}) - endif() - - if(NOT TARGET VDT::VDT) - add_library(VDT::VDT UNKNOWN IMPORTED) - - set_target_properties(VDT::VDT - PROPERTIES - IMPORTED_LOCATION "${VDT_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${VDT_INCLUDE_DIRS}" - ) - endif() -endif() diff --git a/tests/benchmark/CMakeLists.txt b/tests/benchmark/CMakeLists.txt index 12f610b441..a7d50be739 100644 --- 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 index e458f7f3b0..8f76fc9597 100644 --- 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