From 75c66575c4ae21d2f828284fd1a7d81fd632ef81 Mon Sep 17 00:00:00 2001 From: Albert Ziegenhagel Date: Thu, 4 Jan 2018 17:57:30 +0100 Subject: [vtk] Fix hdf5 target names after hdf5 has been updated to 1.10.1 --- ports/vtk/CONTROL | 2 +- ports/vtk/FindHDF5.cmake | 32 ++++++++++++++++++-------------- ports/vtk/portfile.cmake | 16 ++++++++-------- 3 files changed, 27 insertions(+), 23 deletions(-) (limited to 'ports') diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 3919619ef..66ee71f23 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.0.1-5 +Version: 8.0.1-6 Description: Software system for 3D computer graphics, image processing, and visualization Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora diff --git a/ports/vtk/FindHDF5.cmake b/ports/vtk/FindHDF5.cmake index 4a8c4a166..f3c6bd30f 100644 --- a/ports/vtk/FindHDF5.cmake +++ b/ports/vtk/FindHDF5.cmake @@ -2,22 +2,26 @@ find_package(HDF5 NO_MODULE REQUIRED) set(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR}) -add_library(vtk::hdf5::hdf5 INTERFACE IMPORTED GLOBAL) -if(TARGET hdf5-static) - set_target_properties(vtk::hdf5::hdf5 PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5-static") -elseif(TARGET hdf5-shared) - set_target_properties(vtk::hdf5::hdf5 PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5-shared") -else() - message(FATAL_ERROR "could not find target hdf5-*") +if(NOT TARGET vtk::hdf5::hdf5) + add_library(vtk::hdf5::hdf5 INTERFACE IMPORTED GLOBAL) + if(TARGET hdf5::hdf5-static) + set_target_properties(vtk::hdf5::hdf5 PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5::hdf5-static") + elseif(TARGET hdf5::hdf5-shared) + set_target_properties(vtk::hdf5::hdf5 PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared") + else() + message(FATAL_ERROR "could not find target hdf5-*") + endif() endif() -add_library(vtk::hdf5::hdf5_hl INTERFACE IMPORTED GLOBAL) -if(TARGET hdf5_hl-static) - set_target_properties(vtk::hdf5::hdf5_hl PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5_hl-static") -elseif(TARGET hdf5_hl-shared) - set_target_properties(vtk::hdf5::hdf5_hl PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5_hl-shared") -else() - message(FATAL_ERROR "could not find target hdf5_hl-*") +if(NOT TARGET vtk::hdf5::hdf5_hl) + add_library(vtk::hdf5::hdf5_hl INTERFACE IMPORTED GLOBAL) + if(TARGET hdf5::hdf5_hl-static) + set_target_properties(vtk::hdf5::hdf5_hl PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5::hdf5_hl-static") + elseif(TARGET hdf5::hdf5_hl-shared) + set_target_properties(vtk::hdf5::hdf5_hl PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5::hdf5_hl-shared") + else() + message(FATAL_ERROR "could not find target hdf5_hl-*") + endif() endif() set(HDF5_LIBRARIES "$" "$") diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index f46b47cbf..51f7df4c6 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -12,28 +12,28 @@ vcpkg_from_github( ) # ============================================================================= -# Options: These should be set by feature-packages when they become available +# Options: if ("qt" IN_LIST FEATURES) - set(VTK_WITH_QT ON ) # IMPORTANT: if ON make sure `qt5` is listed as dependency in the CONTROL file + set(VTK_WITH_QT ON ) else() - set(VTK_WITH_QT OFF ) # IMPORTANT: if ON make sure `qt5` is listed as dependency in the CONTROL file + set(VTK_WITH_QT OFF ) endif() if ("mpi" IN_LIST FEATURES) - set(VTK_WITH_MPI ON ) # IMPORTANT: if ON make sure `mpi` is listed as dependency in the CONTROL file + set(VTK_WITH_MPI ON ) else() - set(VTK_WITH_MPI OFF ) # IMPORTANT: if ON make sure `mpi` is listed as dependency in the CONTROL file + set(VTK_WITH_MPI OFF ) endif() if ("python" IN_LIST FEATURES) - set(VTK_WITH_PYTHON ON) # IMPORTANT: if ON make sure `python3` is listed as dependency in the CONTROL file + set(VTK_WITH_PYTHON ON) else() - set(VTK_WITH_PYTHON OFF) # IMPORTANT: if ON make sure `python3` is listed as dependency in the CONTROL file + set(VTK_WITH_PYTHON OFF) endif() if("openvr" IN_LIST FEATURES) - set(VTK_WITH_OPENVR ON) # IMPORTANT: if ON make sure `OpenVR` is listed as dependency in the CONTROL file + set(VTK_WITH_OPENVR ON) else() set(VTK_WITH_OPENVR OFF) endif() -- cgit v1.2.3