ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VORONOI.cmake: use VORO imported target

Browse Source
This commit is contained in:
Christoph Junghans
2020-03-24 11:05:25 -06:00
parent 9b244b14a6
commit 51eb865d63
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/Modules/FindVORO.cmake
View File

@ -10,13 +10,23 @@ find_path(VORO_INCLUDE_DIR voro++.hh PATH_SUFFIXES voro++)
find_library(VORO_LIBRARY NAMES voro++) find_library(VORO_LIBRARY NAMES voro++)
set(VORO_LIBRARIES ${VORO_LIBRARY})
set(VORO_INCLUDE_DIRS ${VORO_INCLUDE_DIR})
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set VORO_FOUND to TRUE # handle the QUIETLY and REQUIRED arguments and set VORO_FOUND to TRUE
# if all listed variables are TRUE # if all listed variables are TRUE
find_package_handle_standard_args(VORO DEFAULT_MSG VORO_LIBRARY VORO_INCLUDE_DIR) 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 ) mark_as_advanced(VORO_INCLUDE_DIR VORO_LIBRARY )

7
cmake/Modules/Packages/VORONOI.cmake
View File

@ -29,15 +29,14 @@ if(PKG_VORONOI)
BUILD_BYPRODUCTS <SOURCE_DIR>/src/libvoro++.a BUILD_BYPRODUCTS <SOURCE_DIR>/src/libvoro++.a
) )
ExternalProject_get_property(voro_build SOURCE_DIR) ExternalProject_get_property(voro_build SOURCE_DIR)
set(VORO_LIBRARIES ${SOURCE_DIR}/src/libvoro++.a) target_link_libraries(lammps PRIVATE ${SOURCE_DIR}/src/libvoro++.a)
set(VORO_INCLUDE_DIRS ${SOURCE_DIR}/src) target_include_directories(lammps PRIVATE ${SOURCE_DIR}/src)
add_dependencies(lammps voro_build) add_dependencies(lammps voro_build)
else() else()
find_package(VORO) find_package(VORO)
if(NOT VORO_FOUND) 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") 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() endif()
target_link_libraries(lammps PRIVATE VORO::VORO)
endif() endif()
include_directories(${VORO_INCLUDE_DIRS})
target_link_libraries(lammps PRIVATE ${VORO_LIBRARIES})
endif() endif()