fixup! [CMake] Make VDT an IMPORTED target; convert to target-based cmake.

Author: hageboeck

cmake/modules/SearchInstalledSoftware.cmake

@@ -1657,14 +1657,16 @@ if(vdt OR builtin_vdt)
           set(builtin_vdt ON CACHE BOOL "Enabled because external vdt not found (${vdt_description})" FORCE)
         endif()
       endif()
-    endif()
+     else()
+       add_library(VDT ALIAS VDT::VDT)
+     endif()
   endif()
   if(builtin_vdt)
     set(vdt_version 0.4.3)
     set(VDT_FOUND True)
     set(VDT_LIBRARIES ${CMAKE_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}vdt${CMAKE_SHARED_LIBRARY_SUFFIX})
     ExternalProject_Add(
-      VDT
+      BUILTIN_VDT
       URL ${lcgpackages}/vdt-${vdt_version}.tar.gz
       URL_HASH SHA256=705674612ebb5c182b65a8f61f4d173eb7fe7cdeee2235b402541a492e08ace1
       INSTALL_DIR ${CMAKE_BINARY_DIR}
@@ -1681,17 +1683,17 @@ if(vdt OR builtin_vdt)
       TIMEOUT 600
     )
     ExternalProject_Add_Step(
-       VDT copy2externals
+       BUILTIN_VDT copy2externals
        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/include/vdt ${CMAKE_BINARY_DIR}/ginclude/vdt
        DEPENDEES install
     )
     set(VDT_INCLUDE_DIR ${CMAKE_BINARY_DIR}/ginclude)
     set(VDT_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ginclude)
-    if(NOT TARGET VDT::VDT)
-      add_library(VDT::VDT IMPORTED SHARED ${VDT_LIBRARIES})
-      set_target_properties(VDT::VDT PROPERTIES
-        IMPORTED_LOCATION "${VDT_LIBRARY}")
-      target_include_directories(VDT::VDT INTERFACE $<BUILD_INTERFACE:${VDT_INCLUDE_DIR}> $<INSTALL_INTERFACE:include/>)
+    if(NOT TARGET VDT)
+      add_library(VDT IMPORTED SHARED)
+      add_dependencies(VDT BUILTIN_VDT)
+      set_target_properties(VDT PROPERTIES IMPORTED_LOCATION "${VDT_LIBRARIES}")
+      target_include_directories(VDT INTERFACE $<BUILD_INTERFACE:${VDT_INCLUDE_DIR}> $<INSTALL_INTERFACE:include/>)
     endif()
 
     install(FILES ${CMAKE_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}vdt${CMAKE_SHARED_LIBRARY_SUFFIX}

math/vecops/CMakeLists.txt

@@ -22,7 +22,7 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTVecOps
 )
 
 if(builtin_vdt OR vdt)
-  target_link_libraries(ROOTVecOps PUBLIC VDT::VDT)
+  target_link_libraries(ROOTVecOps PUBLIC VDT)
 endif()
 
 if(MSVC)

roofit/batchcompute/CMakeLists.txt

@@ -8,7 +8,7 @@ ROOT_LINKER_LIBRARY(RooBatchCompute
 )
 
 if(vdt OR builtin_vdt)
-  target_link_libraries(RooBatchCompute PUBLIC VDT::VDT)
+  target_link_libraries(RooBatchCompute PUBLIC VDT)
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

tmva/tmva/CMakeLists.txt

@@ -435,7 +435,7 @@ if(MSVC)
 endif()
 
 if(vdt OR builtin_vdt)
-  target_link_libraries(TMVA PRIVATE VDT::VDT)
+  target_link_libraries(TMVA PRIVATE VDT)
 endif()
 
 if(tmva-cpu)