Skip to content
Snippets Groups Projects
Commit a363eca1 authored by Guilherme Amadio's avatar Guilherme Amadio
Browse files

Do not use an imported target for Vdt

Fixes: ROOT-9751
parent fbf960e9
No related branches found
No related tags found
No related merge requests found
...@@ -1475,12 +1475,6 @@ if(vdt OR builtin_vdt) ...@@ -1475,12 +1475,6 @@ if(vdt OR builtin_vdt)
endif() endif()
endif() endif()
if(VDT_FOUND AND NOT TARGET Vdt::Vdt)
add_library(Vdt::Vdt INTERFACE IMPORTED)
set_property(TARGET Vdt::Vdt PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${VDT_INCLUDE_DIRS}")
set_property(TARGET Vdt::Vdt PROPERTY INTERFACE_LINK_LIBRARIES "${VDT_LIBRARIES}")
endif()
#---Check for VecGeom-------------------------------------------------------------------- #---Check for VecGeom--------------------------------------------------------------------
if (vecgeom) if (vecgeom)
message(STATUS "Looking for VecGeom") message(STATUS "Looking for VecGeom")
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# CMakeLists.txt file for building ROOT math/vecops package # CMakeLists.txt file for building ROOT math/vecops package
############################################################################ ############################################################################
if(vdt) if(builtin_vdt)
# needed for rootcling, to be removed link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
include_directories(${VDT_INCLUDE_DIRS}) include_directories(${HEADER_OUTPUT_PATH})
endif() endif()
ROOT_STANDARD_LIBRARY_PACKAGE(ROOTVecOps ROOT_STANDARD_LIBRARY_PACKAGE(ROOTVecOps
...@@ -16,12 +16,17 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTVecOps ...@@ -16,12 +16,17 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTVecOps
src/RVec.cxx src/RVec.cxx
DICTIONARY_OPTIONS DICTIONARY_OPTIONS
-writeEmptyRootPCM -writeEmptyRootPCM
-I${VDT_INCLUDE_DIR}
LIBRARIES LIBRARIES
Core Core
) )
if(vdt) if(builtin_vdt)
target_link_libraries(ROOTVecOps PUBLIC Vdt::Vdt) target_link_libraries(ROOTVecOps PUBLIC $<INSTALL_INTERFACE:vdt>)
target_include_directories(ROOTVecOps PUBLIC $<INSTALL_INTERFACE:include>)
elseif(vdt)
target_link_libraries(ROOTVecOps PUBLIC ${VDT_LIBRARIES})
target_include_directories(ROOTVecOps PUBLIC ${VDT_INCLUDE_DIRS})
endif() endif()
target_compile_options(ROOTVecOps PRIVATE -O3 -ffast-math) target_compile_options(ROOTVecOps PRIVATE -O3 -ffast-math)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment