From 51eb865d6342ec32cd1262635a86d78802f75c7c Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Tue, 24 Mar 2020 11:05:25 -0600
Subject: [PATCH] VORONOI.cmake: use VORO imported target

---
 cmake/Modules/FindVORO.cmake         | 16 +++++++++++++---
 cmake/Modules/Packages/VORONOI.cmake |  7 +++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/cmake/Modules/FindVORO.cmake b/cmake/Modules/FindVORO.cmake
index b0cccbcd1d..3f0fe98ff1 100644
--- a/cmake/Modules/FindVORO.cmake
+++ b/cmake/Modules/FindVORO.cmake
@@ -10,13 +10,23 @@ find_path(VORO_INCLUDE_DIR voro++.hh PATH_SUFFIXES voro++)
 
 find_library(VORO_LIBRARY NAMES voro++)
 
-set(VORO_LIBRARIES ${VORO_LIBRARY})
-set(VORO_INCLUDE_DIRS ${VORO_INCLUDE_DIR})
-
 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set VORO_FOUND to TRUE
 # if all listed variables are TRUE
 
 find_package_handle_standard_args(VORO DEFAULT_MSG VORO_LIBRARY VORO_INCLUDE_DIR)
 
+# Copy the results to the output variables and target.
+if(VORO_FOUND)
+  set(VORO_LIBRARIES ${VORO_LIBRARY})
+  set(VORO_INCLUDE_DIRS ${VORO_INCLUDE_DIR})
+
+  if(NOT TARGET VORO::VORO)
+    add_library(VORO::VORO UNKNOWN IMPORTED)
+    set_target_properties(VORO::VORO PROPERTIES
+      IMPORTED_LOCATION "${VORO_LIBRARY}"
+      INTERFACE_INCLUDE_DIRECTORIES "${VORO_INCLUDE_DIR}")
+  endif()
+endif()
+
 mark_as_advanced(VORO_INCLUDE_DIR VORO_LIBRARY )
diff --git a/cmake/Modules/Packages/VORONOI.cmake b/cmake/Modules/Packages/VORONOI.cmake
index d2bb185228..e7f2b6b46d 100644
--- a/cmake/Modules/Packages/VORONOI.cmake
+++ b/cmake/Modules/Packages/VORONOI.cmake
@@ -29,15 +29,14 @@ if(PKG_VORONOI)
       BUILD_BYPRODUCTS <SOURCE_DIR>/src/libvoro++.a
       )
     ExternalProject_get_property(voro_build SOURCE_DIR)
-    set(VORO_LIBRARIES ${SOURCE_DIR}/src/libvoro++.a)
-    set(VORO_INCLUDE_DIRS ${SOURCE_DIR}/src)
+    target_link_libraries(lammps PRIVATE ${SOURCE_DIR}/src/libvoro++.a)
+    target_include_directories(lammps PRIVATE ${SOURCE_DIR}/src)
     add_dependencies(lammps voro_build)
   else()
     find_package(VORO)
     if(NOT VORO_FOUND)
       message(FATAL_ERROR "Voro++ library not found. Help CMake to find it by setting VORO_LIBRARY and VORO_INCLUDE_DIR, or set DOWNLOAD_VORO=ON to download it")
     endif()
+    target_link_libraries(lammps PRIVATE VORO::VORO)
   endif()
-  include_directories(${VORO_INCLUDE_DIRS})
-  target_link_libraries(lammps PRIVATE ${VORO_LIBRARIES})
 endif()