diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-06-23 19:20:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 10:20:18 -0700 |
| commit | 03766d0834c1ca8dea25ffafbe4fe1c60786a412 (patch) | |
| tree | f1dfa6d4a06ed5129f12ce59296c50d2eb920fbb /ports/vtk/6890.diff | |
| parent | aef838536ea3a08e3c1030ead553ca6456cc7fe3 (diff) | |
| download | vcpkg-03766d0834c1ca8dea25ffafbe4fe1c60786a412.tar.gz vcpkg-03766d0834c1ca8dea25ffafbe4fe1c60786a412.zip | |
[CGNS/ParaView] Add new ports (#9960)
* [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>
Diffstat (limited to 'ports/vtk/6890.diff')
| -rw-r--r-- | ports/vtk/6890.diff | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/ports/vtk/6890.diff b/ports/vtk/6890.diff new file mode 100644 index 000000000..632e5f366 --- /dev/null +++ b/ports/vtk/6890.diff @@ -0,0 +1,74 @@ +diff --git a/CMake/FindFreetype.cmake b/CMake/FindFreetype.cmake +index 41029f461330ab23e185ca91a4a8c093944b2d54..7b3b8026383e13b5c6387f176a191dd520da1ada 100644 +--- a/CMake/FindFreetype.cmake ++++ b/CMake/FindFreetype.cmake +@@ -174,17 +174,27 @@ mark_as_advanced( + if(Freetype_FOUND) + if(NOT TARGET Freetype::Freetype) + include(vtkDetectLibraryType) ++ set(freetype_library_type UNKNOWN) + if (FREETYPE_LIBRARY_RELEASE) +- set(_freetype_library_path "${FREETYPE_LIBRARY_RELEASE}") +- elseif (FREETYPE_LIBRARY_DEBUG) +- set(_freetype_library_path "${FREETYPE_LIBRARY_DEBUG}") +- else () +- set(_freetype_library_path "${FREETYPE_LIBRARY}") ++ vtk_detect_library_type(freetype_release_library_type ++ PATH "${FREETYPE_LIBRARY_RELEASE}") ++ endif () ++ if (FREETYPE_LIBRARY_DEBUG) ++ vtk_detect_library_type(freetype_debug_library_type ++ PATH "${FREETYPE_LIBRARY_DEBUG}") ++ endif () ++ if (freetype_release_library_type AND freetype_debug_library_type) ++ if (freetype_release_library_type STREQUAL freetype_debug_library_type) ++ set(freetype_library_type "${freetype_release_library_type}") ++ endif () ++ elseif (freetype_release_library_type) ++ set(freetype_library_type "${freetype_release_library_type}") ++ elseif (freetype_debug_library_type) ++ set(freetype_library_type "${freetype_debug_library_type}") + endif () +- vtk_detect_library_type(freetype_library_type +- PATH "${_freetype_library_path}") +- unset(_freetype_library_path) + add_library(Freetype::Freetype "${freetype_library_type}" IMPORTED) ++ unset(freetype_release_library_type) ++ unset(freetype_debug_library_type) + unset(freetype_library_type) + set_target_properties(Freetype::Freetype PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${FREETYPE_INCLUDE_DIRS}") +diff --git a/CMake/FindLibHaru.cmake b/CMake/FindLibHaru.cmake +index 7ef877a49307309232c932576f1641b9ae28564d..1f5b881facca745910c7d1223e6f737b157424d7 100644 +--- a/CMake/FindLibHaru.cmake ++++ b/CMake/FindLibHaru.cmake +@@ -45,9 +45,27 @@ if (LibHaru_FOUND) + + if (NOT TARGET LibHaru::LibHaru) + include(vtkDetectLibraryType) +- vtk_detect_library_type(libharu_library_type +- PATH "${LibHaru_LIBRARY}") ++ set(libharu_library_type UNKNOWN) ++ if (LibHaru_LIBRARY_RELEASE) ++ vtk_detect_library_type(libharu_release_library_type ++ PATH "${LibHaru_LIBRARY_RELEASE}") ++ endif () ++ if (LibHaru_LIBRARY_DEBUG) ++ vtk_detect_library_type(libharu_debug_library_type ++ PATH "${LibHaru_LIBRARY_DEBUG}") ++ endif () ++ if (libharu_release_library_type AND libharu_debug_library_type) ++ if (libharu_release_library_type STREQUAL libharu_debug_library_type) ++ set(libharu_library_type "${libharu_release_library_type}") ++ endif () ++ elseif (libharu_release_library_type) ++ set(libharu_library_type "${libharu_release_library_type}") ++ elseif (libharu_debug_library_type) ++ set(libharu_library_type "${libharu_debug_library_type}") ++ endif () + add_library(LibHaru::LibHaru "${libharu_library_type}" IMPORTED) ++ unset(libharu_release_library_type) ++ unset(libharu_debug_library_type) + unset(libharu_library_type) + set_target_properties(LibHaru::LibHaru PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${LibHaru_INCLUDE_DIR}") |