Commit 315eeb5e authored by Emmanuel Promayon's avatar Emmanuel Promayon

Merge branch 'feature/vtk8-compatibiltiy' of...

Merge branch 'feature/vtk8-compatibiltiy' of gricad-gitlab.univ-grenoble-alpes.fr:CamiTK/CamiTK into feature/vtk8-compatibiltiy
parents b8d67105 4f225325
......@@ -151,12 +151,24 @@ if(MSVC)
# CAMITK_VTK_LIBRARIES = VTK input libraries at linkage
foreach(VTK_LIBRARY ${VTK_LIBRARIES})
# Clear some errors on VTK configuration
# rename correctly verdict -> vtkverdict library
# rename correctly verdict -> vtkverdict, vtkproj -> vtklibproj, vtkhdf5_hl -> vtkhdf5_hl_src, vtkhdf5 -> vtkhdf5_src libraries
if(${VTK_LIBRARY} STREQUAL "verdict")
set(VTK_LIBRARY "vtkverdict")
endif()
if("${VTK_VERSION}" VERSION_GREATER_EQUAL 8.2)
if(${VTK_LIBRARY} STREQUAL "vtkhdf5_hl_src")
set(VTK_LIBRARY "vtkhdf5_hl")
endif()
if(${VTK_LIBRARY} STREQUAL "vtkhdf5_src")
set(VTK_LIBRARY "vtkhdf5")
endif()
if(${VTK_LIBRARY} STREQUAL "vtklibproj")
set(VTK_LIBRARY "vtkproj")
endif()
endif()
set(CAMITK_VTK_LIBRARIES ${CAMITK_VTK_LIBRARIES} debug ${VTK_LIBRARY_DIR}/${VTK_LIBRARY}-${CAMITK_VTK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${VTK_LIBRARY_DIR}/${VTK_LIBRARY}-${CAMITK_VTK_VERSION}.lib)
endforeach()
# add missing vtkIOExport, vtkImagingStencil, vtkIOImport, vtkImagingMath library
set(CAMITK_VTK_LIBRARIES ${CAMITK_VTK_LIBRARIES} debug ${VTK_LIBRARY_DIR}/vtkIOExport-${CAMITK_VTK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${VTK_LIBRARY_DIR}/vtkIOExport-${CAMITK_VTK_VERSION}.lib)
set(CAMITK_VTK_LIBRARIES ${CAMITK_VTK_LIBRARIES} debug ${VTK_LIBRARY_DIR}/vtkImagingStencil-${CAMITK_VTK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${VTK_LIBRARY_DIR}/vtkImagingStencil-${CAMITK_VTK_VERSION}.lib)
......
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