mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-23 11:07:10 +01:00
[vtk] Add find dependency pugixml in cmake config file (#10379)
* [vtk] Add find dependency pugixml in cmake config file * [vtk] Re-generate patch * re-trigger ci test
This commit is contained in:
parent
aeffa625e5
commit
b5deb0c8cd
@ -1,5 +1,5 @@
|
|||||||
Source: vtk
|
Source: vtk
|
||||||
Version: 8.2.0-11
|
Version: 8.2.0-12
|
||||||
Description: Software system for 3D computer graphics, image processing, and visualization
|
Description: Software system for 3D computer graphics, image processing, and visualization
|
||||||
Homepage: https://github.com/Kitware/VTK
|
Homepage: https://github.com/Kitware/VTK
|
||||||
Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c
|
Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c
|
||||||
|
@ -1,5 +1,19 @@
|
|||||||
|
diff --git a/CMake/VTKConfig.cmake.in b/CMake/VTKConfig.cmake.in
|
||||||
|
index d28e0cc..7ed48bc 100644
|
||||||
|
--- a/CMake/VTKConfig.cmake.in
|
||||||
|
+++ b/CMake/VTKConfig.cmake.in
|
||||||
|
@@ -88,6 +88,9 @@ if(VTK_HAS_VTKM AND NOT TARGET vtkm_cont)
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
+# Find dependencies
|
||||||
|
+include(CMakeFindDependencyMacro)
|
||||||
|
+find_dependency(pugixml REQUIRED)
|
||||||
|
|
||||||
|
#-----------------------------------------------------------------------------
|
||||||
|
# Load requested modules.
|
||||||
diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt
|
diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt
|
||||||
index ce979ba..322e2de 100644
|
index ce979ba..744c6f1 100644
|
||||||
--- a/IO/CityGML/CMakeLists.txt
|
--- a/IO/CityGML/CMakeLists.txt
|
||||||
+++ b/IO/CityGML/CMakeLists.txt
|
+++ b/IO/CityGML/CMakeLists.txt
|
||||||
@@ -4,8 +4,5 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
|
@@ -4,8 +4,5 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
|
||||||
|
@ -250,8 +250,8 @@ endif()
|
|||||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||||
|
|
||||||
|
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk)
|
||||||
|
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
# Handle copyright
|
# Handle copyright
|
||||||
file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||||
|
|
||||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk)
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user