Commit 4956c764 authored by Burlen Loring's avatar Burlen Loring
Browse files

rename vtk interface library

parent 702964dc
...@@ -60,7 +60,7 @@ endif() ...@@ -60,7 +60,7 @@ endif()
include(thread) include(thread)
include(mpi) include(mpi)
include(vtk) include(svtk)
include(timer) include(timer)
include(pugixml) include(pugixml)
include(timer) include(timer)
......
...@@ -13,11 +13,11 @@ if (ENABLE_CATALYST) ...@@ -13,11 +13,11 @@ if (ENABLE_CATALYST)
"containing `ParaViewConfig.cmake`.") "containing `ParaViewConfig.cmake`.")
endif() endif()
add_library(vtk INTERFACE) add_library(svtk INTERFACE)
target_link_libraries(vtk INTERFACE ${VTK_LIBRARIES}) target_link_libraries(svtk INTERFACE ${VTK_LIBRARIES})
target_include_directories(vtk SYSTEM INTERFACE ${PARAVIEW_INCLUDE_DIRS}) target_include_directories(svtk SYSTEM INTERFACE ${PARAVIEW_INCLUDE_DIRS})
target_compile_definitions(vtk INTERFACE ${VTK_DEFINITIONS}) target_compile_definitions(svtk INTERFACE ${VTK_DEFINITIONS})
install(TARGETS vtk EXPORT vtk) install(TARGETS svtk EXPORT svtk)
install(EXPORT vtk DESTINATION lib/cmake EXPORT_LINK_INTERFACE_LIBRARIES) install(EXPORT svtk DESTINATION lib/cmake EXPORT_LINK_INTERFACE_LIBRARIES)
endif() endif()
...@@ -29,7 +29,7 @@ if (ENABLE_PYTHON) ...@@ -29,7 +29,7 @@ if (ENABLE_PYTHON)
add_library(python INTERFACE) add_library(python INTERFACE)
target_include_directories(python INTERFACE ${PYTHON_INCLUDE_PATH} ${MPI4PY_INCLUDE_DIR}) target_include_directories(python INTERFACE ${PYTHON_INCLUDE_PATH} ${MPI4PY_INCLUDE_DIR})
target_link_libraries(python INTERFACE ${PYTHON_LIBRARIES} vtk) target_link_libraries(python INTERFACE ${PYTHON_LIBRARIES} svtk)
install(TARGETS python EXPORT python) install(TARGETS python EXPORT python)
install(EXPORT python DESTINATION lib/cmake EXPORT_LINK_INTERFACE_LIBRARIES) install(EXPORT python DESTINATION lib/cmake EXPORT_LINK_INTERFACE_LIBRARIES)
......
...@@ -26,7 +26,7 @@ if (ENABLE_VTK_ACCELERATORS) ...@@ -26,7 +26,7 @@ if (ENABLE_VTK_ACCELERATORS)
endif() endif()
if (NOT ENABLE_CATALYST) if (NOT ENABLE_CATALYST)
add_library(vtk INTERFACE) add_library(svtk INTERFACE)
find_package(VTK QUIET COMPONENTS ${SENSEI_VTK_COMPONENTS}) find_package(VTK QUIET COMPONENTS ${SENSEI_VTK_COMPONENTS})
if (NOT VTK_FOUND) if (NOT VTK_FOUND)
...@@ -35,10 +35,10 @@ if (NOT ENABLE_CATALYST) ...@@ -35,10 +35,10 @@ if (NOT ENABLE_CATALYST)
"VTK_DIR to point to a directory containing `VTKConfig.cmake`.") "VTK_DIR to point to a directory containing `VTKConfig.cmake`.")
endif() endif()
target_link_libraries(vtk INTERFACE ${VTK_LIBRARIES}) target_link_libraries(svtk INTERFACE ${VTK_LIBRARIES})
target_include_directories(vtk SYSTEM INTERFACE ${VTK_INCLUDE_DIRS}) target_include_directories(svtk SYSTEM INTERFACE ${VTK_INCLUDE_DIRS})
target_compile_definitions(vtk INTERFACE ${VTK_DEFINITIONS}) target_compile_definitions(svtk INTERFACE ${VTK_DEFINITIONS})
install(TARGETS vtk EXPORT vtk) install(TARGETS svtk EXPORT svtk)
install(EXPORT vtk DESTINATION lib/cmake EXPORT_LINK_INTERFACE_LIBRARIES) install(EXPORT svtk DESTINATION lib/cmake EXPORT_LINK_INTERFACE_LIBRARIES)
endif() endif()
...@@ -8,7 +8,7 @@ if (ENABLE_SENSEI) ...@@ -8,7 +8,7 @@ if (ENABLE_SENSEI)
ProgrammableDataAdaptor.cxx VTKHistogram.cxx VTKDataAdaptor.cxx ProgrammableDataAdaptor.cxx VTKHistogram.cxx VTKDataAdaptor.cxx
VTKUtils.cxx) VTKUtils.cxx)
set(senseiCore_libs mpi pugixml vtk thread timer diy grid) set(senseiCore_libs mpi pugixml svtk thread timer diy grid)
if (ENABLE_CONDUIT) if (ENABLE_CONDUIT)
list(APPEND senseiCore_sources ConduitDataAdaptor.cxx) list(APPEND senseiCore_sources ConduitDataAdaptor.cxx)
......
if (BUILD_TESTING) if (BUILD_TESTING)
add_executable(CompareImages CompareImages.cxx) add_executable(CompareImages CompareImages.cxx)
target_link_libraries(CompareImages vtk) target_link_libraries(CompareImages svtk)
endif() endif()
...@@ -4,7 +4,7 @@ target_include_directories(timer SYSTEM INTERFACE ...@@ -4,7 +4,7 @@ target_include_directories(timer SYSTEM INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include/timer>) $<INSTALL_INTERFACE:include/timer>)
target_link_libraries(timer vtk mpi) target_link_libraries(timer svtk mpi)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/" install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/"
DESTINATION include/timer FILES_MATCHING PATTERN "*.h") DESTINATION include/timer FILES_MATCHING PATTERN "*.h")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment