diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-03-28 11:23:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 20:23:18 -0700 |
| commit | b5deb0c8cddc22469cc0747de39ae0a17db313ad (patch) | |
| tree | ec05721fc571c65463081b8b898dbab49a049d85 | |
| parent | aeffa625e55eea41a86a728c14a95d05bc3de0e9 (diff) | |
| download | vcpkg-b5deb0c8cddc22469cc0747de39ae0a17db313ad.tar.gz vcpkg-b5deb0c8cddc22469cc0747de39ae0a17db313ad.zip | |
[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
| -rw-r--r-- | ports/vtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vtk/fix-pugixml-link.patch | 42 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 4 |
3 files changed, 31 insertions, 17 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index e8693b06e..bf0f64ad7 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.2.0-11 +Version: 8.2.0-12 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, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c diff --git a/ports/vtk/fix-pugixml-link.patch b/ports/vtk/fix-pugixml-link.patch index 9a5edb5f5..aadd41adb 100644 --- a/ports/vtk/fix-pugixml-link.patch +++ b/ports/vtk/fix-pugixml-link.patch @@ -1,14 +1,28 @@ -diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt
-index ce979ba..322e2de 100644
---- a/IO/CityGML/CMakeLists.txt
-+++ b/IO/CityGML/CMakeLists.txt
-@@ -4,8 +4,5 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
- # pugixml does not set _INCLUDE_DIRS or _LIBRARIES
- if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS)
- find_package(pugixml REQUIRED)
-- get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES)
-- get_target_property(pugixml_LIBRARIES pugixml LOCATION)
-- include_directories(${pugixml_INCLUDE_DIRS})
-- vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
-+ vtk_module_link_libraries(vtkIOCityGML LINK_PUBLIC pugixml)
- endif()
+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 +index ce979ba..744c6f1 100644 +--- a/IO/CityGML/CMakeLists.txt ++++ b/IO/CityGML/CMakeLists.txt +@@ -4,8 +4,5 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS}) + # pugixml does not set _INCLUDE_DIRS or _LIBRARIES + if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS) + find_package(pugixml REQUIRED) +- get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES) +- get_target_property(pugixml_LIBRARIES pugixml LOCATION) +- include_directories(${pugixml_INCLUDE_DIRS}) +- vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES}) ++ vtk_module_link_libraries(vtkIOCityGML LINK_PUBLIC pugixml) + endif() diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 4743c6520..183b4e96b 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -250,8 +250,8 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) + # ============================================================================= # Handle copyright file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk) |