mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 09:29:16 +08:00
03766d0834
* [cgns] add port cgns * [paraview] add new port * [paraview] correct dependencies; disable catalyst * [VTK/ParaView] Make ParaView build * [paraview] add missing patch * [paraview] add cgns patch * [paraview] add qt plugin patches back in. Remove in the future * [vtk] slightly improved patches * [vtk] don't disable findPython * [paraview] add more features * [paraview] remove X11Extras from OSX * [vtk] make vtk workcorrectly with python and prepare for paraview with python * [paraview] Python fixes * [paraview] small bin -> lib replacement fix for static builds * [vtk] fix patch path * update baseline to exclude paraview for the time being on osx and linux. requires a fix in qt5-base linkage of libpq. * [paraview]try setting LD_LIBRARY_PATH for unix systems * [paraview] a bit of cleanup * update baseline * fix typo in baseline * [paraview] remove unnecessary patch * [vtk] replace custom patch with upstream patch * [paraview] cleanup in the portfile. * Update ports/paraview/CONTROL Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
30 lines
926 B
Diff
30 lines
926 B
Diff
diff --git a/CMake/FindCGNS.cmake b/CMake/FindCGNS.cmake
|
|
index 005f1afd9..a45103a9f 100644
|
|
--- a/CMake/FindCGNS.cmake
|
|
+++ b/CMake/FindCGNS.cmake
|
|
@@ -16,7 +16,7 @@ mark_as_advanced(CGNS_INCLUDE_DIR)
|
|
|
|
find_library(CGNS_LIBRARY
|
|
NAMES
|
|
- cgns
|
|
+ cgnsdll cgns
|
|
DOC "CGNS library")
|
|
mark_as_advanced(CGNS_LIBRARY)
|
|
|
|
@@ -45,4 +45,15 @@ if (CGNS_FOUND)
|
|
IMPORTED_LOCATION "${CGNS_LIBRARY}"
|
|
INTERFACE_INCLUDE_DIRECTORIES "${CGNS_INCLUDE_DIR}")
|
|
endif ()
|
|
+ include(CMakeFindDependencyMacro)
|
|
+ find_dependency(hdf5 CONFIG)
|
|
+ if(TARGET hdf5::hdf5-shared)
|
|
+ set_property(TARGET CGNS::CGNS APPEND PROPERTY
|
|
+ INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared")
|
|
+ elseif(TARGET hdf5::hdf5-static)
|
|
+ set_property(TARGET CGNS::CGNS APPEND PROPERTY
|
|
+ INTERFACE_LINK_LIBRARIES "hdf5::hdf5-static")
|
|
+ else()
|
|
+ message(FATAL_ERROR "No HDF5 target to link cgns against")
|
|
+ endif()
|
|
endif ()
|