Commit c22f5594 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot
Browse files

Merge topic 'vtkm_uses_custom_vtk_suffix'

d1c248c3

 VTK-m respects the VTK custom library suffix
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !4817
parents fbd18135 d1c248c3
...@@ -33,7 +33,7 @@ set(VTKm_ENABLE_RENDERING OFF CACHE BOOL "Disabled when building as part of VTK" ...@@ -33,7 +33,7 @@ set(VTKm_ENABLE_RENDERING OFF CACHE BOOL "Disabled when building as part of VTK"
set(VTKm_USE_64BIT_IDS ${VTK_USE_64BIT_IDS} CACHE BOOL "Set to match VTK" FORCE) set(VTKm_USE_64BIT_IDS ${VTK_USE_64BIT_IDS} CACHE BOOL "Set to match VTK" FORCE)
set(lib_suffix "-vtk${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}") set(lib_suffix "-vtk${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}")
if(VTK_CUSTOM_LIBRARY_SUFFIX) if(DEFINED VTK_CUSTOM_LIBRARY_SUFFIX)
set(lib_suffix "${VTK_CUSTOM_LIBRARY_SUFFIX}") set(lib_suffix "${VTK_CUSTOM_LIBRARY_SUFFIX}")
endif() endif()
......
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