mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[vtk] update to 9.0.1 (#12149)
* [vtk] update to 9.0.1 * [paraview] silence linux ci by adding embree3 as a build-depends to paraview (just a workaround) * [vtk] disable remote modules to make feature all actually work * [vtk] delete old patch
This commit is contained in:
parent
e96a3bd41b
commit
c6dafe169a
@ -1,74 +0,0 @@
|
||||
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}")
|
@ -1,5 +1,5 @@
|
||||
Source: vtk
|
||||
Version: 9.0-4
|
||||
Version: 9.0.1
|
||||
Description: Software system for 3D computer graphics, image processing, and visualization
|
||||
Homepage: https://github.com/Kitware/VTK
|
||||
Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2
|
||||
|
@ -101,11 +101,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Kitware/VTK
|
||||
REF ab278e87b181e3a02082bea7361fbaa3ddafb3ad # v9.0
|
||||
SHA512 50a324f55b58bc4415f972f711420e83b41a100b27729266db4541c24bc7d7bcd27d9158ce2588178b9b2e43c20b9695ffe382605f5cde331e8371e213655164
|
||||
REF 96e6fa9b3ff245e4d51d49f23d40e9ad8774e85e # v9.0.1
|
||||
SHA512 0efb1845053b6143e5ee7fa081b8be98f6825262c59051e88b2be02497e23362055067b2f811eff82e93eb194e5a9afd2a12e3878a252eb4011a5dab95127a6f
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
6890.diff # already merged upstream
|
||||
FindLZMA.patch # Will be fixed in 9.1?
|
||||
FindLZ4.patch
|
||||
Findproj.patch
|
||||
@ -141,6 +140,7 @@ vcpkg_configure_cmake(
|
||||
-DVTK_INSTALL_PACKAGE_DIR=share/vtk
|
||||
-DVTK_INSTALL_RUNTIME_DIR=bin
|
||||
-DVTK_FORBID_DOWNLOADS=ON
|
||||
-DVTK_ENABLE_REMOTE_MODULES=OFF
|
||||
# VTK groups to enable
|
||||
-DVTK_GROUP_ENABLE_StandAlone=YES
|
||||
-DVTK_GROUP_ENABLE_Rendering=YES
|
||||
|
Loading…
x
Reference in New Issue
Block a user